tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

CheckResults: internal cleanup 

replace the one-big-dictionary with normal private attributes
This commit is contained in:
Brian Warner 2012-05-25 12:55:48 -07:00
parent 437de4340b
commit c03b6aff97
1 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/allmydata/check_results.py
View File

@ -32,30 +32,30 @@ class CheckResults:
if not self._recoverable: if not self._recoverable:
assert not self._healthy assert not self._healthy
self._needs_rebalancing_p = bool(needs_rebalancing) self._needs_rebalancing_p = bool(needs_rebalancing)
self._count_shares_needed = count_shares_needed
self._count_shares_expected = count_shares_expected
self._count_shares_good = count_shares_good
self._count_good_share_hosts = count_good_share_hosts
self._count_recoverable_versions = count_recoverable_versions
self._count_unrecoverable_versions = count_unrecoverable_versions
for s in servers_responding: for s in servers_responding:
assert isinstance(s, str), s assert isinstance(s, str), s
self._servers_responding = servers_responding
for shnum, serverids in sharemap.items(): for shnum, serverids in sharemap.items():
for serverid in serverids: for serverid in serverids:
assert isinstance(serverid, str), serverid assert isinstance(serverid, str), serverid
self._sharemap = sharemap
self._count_wrong_shares = count_wrong_shares
for (serverid, SI, shnum) in list_corrupt_shares: for (serverid, SI, shnum) in list_corrupt_shares:
assert isinstance(serverid, str), serverid assert isinstance(serverid, str), serverid
self._list_corrupt_shares = list_corrupt_shares
self._count_corrupt_shares = count_corrupt_shares
for (serverid, SI, shnum) in list_incompatible_shares: for (serverid, SI, shnum) in list_incompatible_shares:
assert isinstance(serverid, str), serverid assert isinstance(serverid, str), serverid
data = {"count-shares-needed": count_shares_needed, self._list_incompatible_shares = list_incompatible_shares
"count-shares-expected": count_shares_expected, self._count_incompatible_shares = count_incompatible_shares
"count-shares-good": count_shares_good,
"count-good-share-hosts": count_good_share_hosts,
"count-recoverable-versions": count_recoverable_versions,
"count-unrecoverable-versions": count_unrecoverable_versions,
"servers-responding": servers_responding,
"sharemap": sharemap,
"count-wrong-shares": count_wrong_shares,
"list-corrupt-shares": list_corrupt_shares,
"count-corrupt-shares": count_corrupt_shares,
"list-incompatible-shares": list_incompatible_shares,
"count-incompatible-shares": count_incompatible_shares,
}
self._data = data
assert isinstance(summary, str) # should be a single string assert isinstance(summary, str) # should be a single string
self._summary = summary self._summary = summary
assert not isinstance(report, str) # should be list of strings assert not isinstance(report, str) # should be list of strings
@ -82,37 +82,51 @@ class CheckResults:
return self._needs_rebalancing_p return self._needs_rebalancing_p
def get_encoding_needed(self): def get_encoding_needed(self):
return self._data["count-shares-needed"] return self._count_shares_needed
def get_encoding_expected(self): def get_encoding_expected(self):
return self._data["count-shares-expected"] return self._count_shares_expected
def get_share_counter_good(self): def get_share_counter_good(self):
return self._data["count-shares-good"] return self._count_shares_good
def get_share_counter_wrong(self): def get_share_counter_wrong(self):
return self._data["count-wrong-shares"] return self._count_wrong_shares
def get_corrupt_shares(self): def get_corrupt_shares(self):
return self._data["list-corrupt-shares"] return self._list_corrupt_shares
def get_incompatible_shares(self): def get_incompatible_shares(self):
return self._data["list-incompatible-shares"] return self._list_incompatible_shares
def get_servers_responding(self): def get_servers_responding(self):
return self._data["servers-responding"] return self._servers_responding
def get_host_counter_good_shares(self): def get_host_counter_good_shares(self):
return self._data["count-good-share-hosts"] return self._count_good_share_hosts
def get_version_counter_recoverable(self): def get_version_counter_recoverable(self):
return self._data["count-recoverable-versions"] return self._count_recoverable_versions
def get_version_counter_unrecoverable(self): def get_version_counter_unrecoverable(self):
return self._data["count-unrecoverable-versions"] return self._count_unrecoverable_versions
def get_sharemap(self): def get_sharemap(self):
return self._data["sharemap"] return self._sharemap
def as_dict(self): def as_dict(self):
return self._data d = {"count-shares-needed": self._count_shares_needed,
"count-shares-expected": self._count_shares_expected,
"count-shares-good": self._count_shares_good,
"count-good-share-hosts": self._count_good_share_hosts,
"count-recoverable-versions": self._count_recoverable_versions,
"count-unrecoverable-versions": self._count_unrecoverable_versions,
"servers-responding": self._servers_responding,
"sharemap": self._sharemap,
"count-wrong-shares": self._count_wrong_shares,
"list-corrupt-shares": self._list_corrupt_shares,
"count-corrupt-shares": self._count_corrupt_shares,
"list-incompatible-shares": self._list_incompatible_shares,
"count-incompatible-shares": self._count_incompatible_shares,
}
return d
def get_summary(self): def get_summary(self):
return self._summary return self._summary