[ARVADOS] updated: ff60e33ff3d9ad8144b9c269d12d1e5f18455416

[git at public.curoverse.com]

Summary of changes:
 services/datamanager/experimental/datamanager.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

       via  ff60e33ff3d9ad8144b9c269d12d1e5f18455416 (commit)
       via  f1b5f32b00d481e06d600cd6009d0995ecd19699 (commit)
      from  e419f135d46050250fdeb10b6e2a2a254caa85d4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ff60e33ff3d9ad8144b9c269d12d1e5f18455416
Author: Misha Zatsman <misha at curoverse.com>
Date:   Wed May 14 00:54:18 2014 +0000

    Reversed histogram format, so timestamps come first.

diff --git a/services/datamanager/experimental/datamanager.py b/services/datamanager/experimental/datamanager.py
index 32d7922..8207bdc 100755
--- a/services/datamanager/experimental/datamanager.py
+++ b/services/datamanager/experimental/datamanager.py
@@ -432,14 +432,15 @@ def outputGarbageCollectionReport(filename):
     for line in garbage_collection_report:
       gcwriter.writerow(line)
 
-
 def computeGarbageCollectionHistogram():
+  # TODO(misha): Modify this to allow users to specify the number of
+  # histogram buckets through a flag.
   histogram = []
   last_percentage = -1
   for _,mtime,_,_,disk_free in garbage_collection_report:
     curr_percentage = percentageFloor(disk_free)
     if curr_percentage > last_percentage:
-      histogram.append( (curr_percentage, mtime) )
+      histogram.append( (mtime, curr_percentage) )
     last_percentage = curr_percentage
 
   log.info('Garbage collection histogram is: %s', histogram)
@@ -608,9 +609,9 @@ cumulative disk size) / total disk capacity
 garbage_collection_histogram = []
 """ Shows the tradeoff of keep block age vs keep disk free space.
 
-Each entry is of the form (Disk Proportion, mtime).
+Each entry is of the form (mtime, Disk Proportion).
 
-An entry of the form (0.52, 1388747781) means that if we deleted the
+An entry of the form (1388747781, 0.52) means that if we deleted the
 oldest non-presisted blocks until we had 52% of the disk free, then
 all blocks with an mtime greater than 1388747781 would be preserved.
 """

commit f1b5f32b00d481e06d600cd6009d0995ecd19699
Author: Misha Zatsman <misha at curoverse.com>
Date:   Wed Apr 30 22:50:37 2014 +0000

    Fixed bug where block mtimes were stored as strings instead of ints. Closes #2631

diff --git a/services/datamanager/experimental/datamanager.py b/services/datamanager/experimental/datamanager.py
index 4224426..32d7922 100755
--- a/services/datamanager/experimental/datamanager.py
+++ b/services/datamanager/experimental/datamanager.py
@@ -358,9 +358,12 @@ def getKeepBlocks(keep_servers):
   blocks = []
   for host,port in keep_servers:
     response = urllib2.urlopen('http://%s:%d/index' % (host, port))
-    blocks.append([line.split(' ')
-                   for line in response.read().split('\n')
-                   if line])
+    server_blocks = [line.split(' ')
+                     for line in response.read().split('\n')
+                     if line]
+    server_blocks = [(block_id, int(mtime))
+                     for block_id, mtime in server_blocks]
+    blocks.append(server_blocks)
   return blocks
 
 def getKeepStats(keep_servers):

-----------------------------------------------------------------------


hooks/post-receive
--