3137: Change --stats to --crunchstat-interval as specified on the ticket.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index fcaef3606e34d4fc561a0d4af596232de24d4907..65cbfd60b69ea5408dfc53f2398a34e421de5ce9 100755 (executable)
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -896,7 +896,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
         .q{&& SWAP=$(awk '($1 == "SwapTotal:"){print $2}' </proc/meminfo) }
         ."&& MEMLIMIT=\$(( (\$MEM * 95) / ($ENV{CRUNCH_NODE_SLOTS} * 100) )) "
         ."&& let SWAPLIMIT=\$MEMLIMIT+\$SWAP ";
-    $command .= "&& exec arv-mount --by-pdh --stats --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
+    $command .= "&& exec arv-mount --by-pdh --crunchstat-interval=10 --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
     if ($docker_hash)
     {
       my $containername = "$Jobstep->{arvados_task}->{uuid}-$Jobstep->{failures}";

diff --git a/services/fuse/bin/arv-mount b/services/fuse/bin/arv-mount
index a8d00c929b518f44ac0b39a19c7ad4ff983a7320..6e22c9f838f02258b89e826796e39d0ecd577a4e 100755 (executable)
--- a/services/fuse/bin/arv-mount
+++ b/services/fuse/bin/arv-mount
@@ -48,8 +48,7 @@ class Stat(object):
                                                              self.ing_name,
                                                              delta))
 
-def statlogger(keep, ops):
-    interval = 10
+def statlogger(interval, keep, ops):
     calls = Stat("keepcalls", interval, "put", "get",
                  keep.put_counter.get,
                  keep.get_counter.get)
@@ -114,7 +113,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 +161,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()