projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump node manager libcloud pin to dev3 refs #7031
[arvados.git]
/
services
/
datamanager
/
experimental
/
datamanager.py
diff --git
a/services/datamanager/experimental/datamanager.py
b/services/datamanager/experimental/datamanager.py
index 4224426cc760371b168705626de32700010ed758..8207bdcd5cb77b232b5fa582d9b487f08a98251b 100755
(executable)
--- 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 = []
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):
return blocks
def getKeepStats(keep_servers):
@@
-429,14
+432,15
@@
def outputGarbageCollectionReport(filename):
for line in garbage_collection_report:
gcwriter.writerow(line)
for line in garbage_collection_report:
gcwriter.writerow(line)
-
def computeGarbageCollectionHistogram():
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 = []
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, mtim
e) )
+ histogram.append( (
mtime, curr_percentag
e) )
last_percentage = curr_percentage
log.info('Garbage collection histogram is: %s', histogram)
last_percentage = curr_percentage
log.info('Garbage collection histogram is: %s', histogram)
@@
-605,9
+609,9
@@
cumulative disk size) / total disk capacity
garbage_collection_histogram = []
""" Shows the tradeoff of keep block age vs keep disk free space.
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.
"""
oldest non-presisted blocks until we had 52% of the disk free, then
all blocks with an mtime greater than 1388747781 would be preserved.
"""