From 83d1fd07d3d16d118b128550182b0048bb18e696 Mon Sep 17 00:00:00 2001 From: Jerry Blakley Date: Tue, 26 Sep 2017 23:31:20 +0000 Subject: [PATCH] Yolo to stage (#392) * Add stat for fresh dir * Dev propfind add parent calls (#390) * Fix names of stats --- src/filecache.c | 2 +- src/fusedav.c | 1 + src/statcache.c | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/filecache.c b/src/filecache.c index f489f21b..7ac3dc44 100644 --- a/src/filecache.c +++ b/src/filecache.c @@ -746,7 +746,7 @@ static void get_fresh_fd(filecache_t *cache, g_set_error(gerr, filecache_quark(), ENOENT, "%s: File %s expected to exist returns 404-partial file transfer.", funcname, path); } else { - g_set_error(gerr, filecache_quark(), ENOENT, "%s: File %s expected to exist returns %d.", + g_set_error(gerr, filecache_quark(), ENOENT, "%s: File %s expected to exist returns %ld.", funcname, path, response_code); } /* we get a 404 because the stat_cache returned that the file existed, but it diff --git a/src/fusedav.c b/src/fusedav.c index 3fec6df5..73db373e 100644 --- a/src/fusedav.c +++ b/src/fusedav.c @@ -682,6 +682,7 @@ static void get_stat(const char *path, struct stat *stbuf, GError **gerr) { if (!config->refresh_dir_for_file_stat || is_base_directory) { GError *subgerr = NULL; log_print(LOG_INFO, SECTION_FUSEDAV_STAT, "Performing zero-depth PROPFIND on path: %s", path); + stats_counter_local("propfind-root", 1); ret = simple_propfind_with_redirect(path, PROPFIND_DEPTH_ZERO, 0, getattr_propfind_callback, NULL, &subgerr); if (subgerr) { // Delete from cache on error; ignore errors from stat_cache_delete since we already have one diff --git a/src/statcache.c b/src/statcache.c index f5fb53e0..0cad8e82 100644 --- a/src/statcache.c +++ b/src/statcache.c @@ -293,9 +293,11 @@ struct stat_cache_value *stat_cache_value_get(stat_cache_t *cache, const char *p free(value); stats_counter("statcache_stale", 1); return NULL; + } else { + stats_counter("statcache_fresh_dir", 1); } } else { - stats_counter("statcache_fresh", 1); + stats_counter("statcache_fresh_file", 1); } }