Merge branch '15319-api-useful-stacktraces'

[arvados.git] / services / fuse / arvados_fuse / crunchstat.py

diff --git a/services/fuse/arvados_fuse/crunchstat.py b/services/fuse/arvados_fuse/crunchstat.py
index e856d839b83338a879395c877c7b039e2f2c04f9..e99573752e1c0e69be8f2e07201530bf56a4024b 100644 (file)
--- a/services/fuse/arvados_fuse/crunchstat.py
+++ b/services/fuse/arvados_fuse/crunchstat.py
@@ -55,9 +55,13 @@ def statlogger(interval, keep, ops):
         Stat("write", ops.write_ops_counter.get), 
         Stat("read", ops.read_ops_counter.get)
     ])
-    fusetime = StatWriter("fuseopstime", interval, [
-        Stat("seconds", ops.fuse_ops_total_time)
-    ])
+    fusetimes = []
+    for cur_op in ops.metric_op_names():   
+        name = "fuseop:{0}".format(cur_op)
+        fusetimes.append(StatWriter(name, interval, [
+            Stat("count", ops.metric_count_func(cur_op)),
+            Stat("time", ops.metric_sum_func(cur_op))
+        ]))
     blk = StatWriter("blkio:0:0", interval, [
         Stat("write", ops.write_counter.get),
         Stat("read", ops.read_counter.get)
@@ -68,8 +72,9 @@ def statlogger(interval, keep, ops):
         calls.update()
         net.update()
         cache.update()
-        fuseops.update()
-        fusetime.update()
         blk.update()
+        fuseops.update()
+        for ftime in fusetimes:
+            ftime.update()