3137: Bump Python SDK version requirement. Tweak Stats() class, don't keep two

[arvados.git] / services / fuse / bin / arv-mount

diff --git a/services/fuse/bin/arv-mount b/services/fuse/bin/arv-mount
index a8d00c929b518f44ac0b39a19c7ad4ff983a7320..44bc698299975230792de112fa2644e6b458c7b8 100755 (executable)
--- a/services/fuse/bin/arv-mount
+++ b/services/fuse/bin/arv-mount
@@ -26,30 +26,31 @@ class Stat(object):
         self.ing_name = ing_name
         self.egress = egr_func
         self.ingress = ing_func
-        self.egr = self.egress()
-        self.ing = self.ingress()
+        self.egr_prev = self.egress()
+        self.ing_prev = self.ingress()
 
     def update(self):
-        self.egr_prev = self.egr
-        self.ing_prev = self.ing
-        self.egr = self.egress()
-        self.ing = self.ingress()
+        egr = self.egress()
+        ing = self.ingress()
 
         delta = " -- interval %.4f seconds %d %s %d %s" % (self.interval,
-                                                           self.egr-self.egr_prev,
+                                                           egr - self.egr_prev,
                                                            self.egr_name,
-                                                           self.ing-self.ing_prev,
+                                                           ing - self.ing_prev,
                                                            self.ing_name)
 
         sys.stderr.write("crunchstat: %s %d %s %d %s%s\n" % (self.prefix,
-                                                             self.egr,
+                                                             egr,
                                                              self.egr_name,
-                                                             self.ing,
+                                                             ing,
                                                              self.ing_name,
                                                              delta))
 
-def statlogger(keep, ops):
-    interval = 10
+        self.egr_prev = egr
+        self.ing_prev = ing
+
+
+def statlogger(interval, keep, ops):
     calls = Stat("keepcalls", interval, "put", "get",
                  keep.put_counter.get,
                  keep.get_counter.get)
@@ -114,7 +115,7 @@ with "--".
     parser.add_argument('--read-only', action='store_false', help="Mount will be read only (default)", dest="enable_write", default=False)
     parser.add_argument('--read-write', action='store_true', help="Mount will be read-write", dest="enable_write", default=False)
 
-    parser.add_argument('--stats', action='store_true', help="Write stats to stderr", default=False)
+    parser.add_argument('--crunchstat-interval', type=float, help="Write stats to stderr every N seconds (default disabled)", default=0)
 
     parser.add_argument('--exec', type=str, nargs=argparse.REMAINDER,
                         dest="exec_args", metavar=('command', 'args', '...', '--'),
@@ -162,8 +163,8 @@ with "--".
         api = ThreadSafeApiCache(apiconfig=arvados.config.settings(),
                                  keep_params={"block_cache": arvados.keep.KeepBlockCache(args.file_cache)})
 
-        if args.stats:
-            statsthread = threading.Thread(target=statlogger, args=(api.keep, operations))
+        if args.crunchstat_interval:
+            statsthread = threading.Thread(target=statlogger, args=(args.crunchstat_interval, api.keep, operations))
             statsthread.daemon = True
             statsthread.start()