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

sets of data points.

diff --git a/services/fuse/bin/arv-mount b/services/fuse/bin/arv-mount
index 6e22c9f838f02258b89e826796e39d0ecd577a4e..44bc698299975230792de112fa2644e6b458c7b8 100755 (executable)
--- a/services/fuse/bin/arv-mount
+++ b/services/fuse/bin/arv-mount
@@ -26,28 +26,30 @@ 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))
 
+        self.egr_prev = egr
+        self.ing_prev = ing
+
+
 def statlogger(interval, keep, ops):
     calls = Stat("keepcalls", interval, "put", "get",
                  keep.put_counter.get,

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index d7ac773f35198b724fbc91db877026035bb832eb..1fd5bde9d6d6ee2bbee7d3e464150276906cc5c4 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -29,7 +29,7 @@ setup(name='arvados_fuse',
         'bin/arv-mount'
         ],
       install_requires=[
-        'arvados-python-client >= 0.1.20150625175218',
+        'arvados-python-client >= 0.1.20151118035730',
         'llfuse>=0.40',
         'python-daemon',
         'ciso8601'