Doc updates and cosmetic fixes for #1115 patch.

Removes the caveat from webapi.txt about count-good-share-hosts being wrong.

This series should close #1115.

diff --git a/docs/frontends/webapi.rst b/docs/frontends/webapi.rst
index 54b60b1ad3daf2e3e90c122bf582781a633352a9..06be6b0d66a4cb2dbc0efcd29ac7628c2a003d65 100644 (file)
--- a/docs/frontends/webapi.rst
+++ b/docs/frontends/webapi.rst
@@ -1375,10 +1375,8 @@ mainly intended for developers.
     count-shares-good: the number of good shares that were found
     count-shares-needed: 'k', the number of shares required for recovery
     count-shares-expected: 'N', the number of total shares generated
-    count-good-share-hosts: this was intended to be the number of distinct
-                            storage servers with good shares. It is currently
-                            (as of Tahoe-LAFS v1.8.0) computed incorrectly;
-                            see ticket #1115.
+    count-good-share-hosts: the number of distinct storage servers with good
+                            shares
     count-wrong-shares: for mutable files, the number of shares for
                         versions other than the 'best' one (highest
                         sequence number, highest roothash). These are

diff --git a/src/allmydata/immutable/filenode.py b/src/allmydata/immutable/filenode.py
index 0bcacb001440960e8042fef8b9e62679f1cfda4e..73f7173e3db7e5fbf98456ef19a7bcd90bbc3dce 100644 (file)
--- a/src/allmydata/immutable/filenode.py
+++ b/src/allmydata/immutable/filenode.py
@@ -122,8 +122,8 @@ class CiphertextFileNode:
                     servers_responding.union(ur.sharemap.iterkeys())
                     prr.data['servers-responding'] = list(servers_responding)
                     prr.data['count-shares-good'] = len(sm)
-                    prr.data['count-good-share-hosts'] = len(reduce(set.union, 
-                                                       sm.itervalues(), set()))
+                    good_hosts = len(reduce(set.union, sm.itervalues(), set()))
+                    prr.data['count-good-share-hosts'] = good_hosts
                     is_healthy = bool(len(sm) >= verifycap.total_shares)
                     is_recoverable = bool(len(sm) >= verifycap.needed_shares)
                     prr.set_healthy(is_healthy)

diff --git a/src/allmydata/test/test_checker.py b/src/allmydata/test/test_checker.py
index 27f4c4edd09e449277150e5f2007b41382ddeb69..79c12747808a915b42787c09b1e1329a4052daa7 100644 (file)
--- a/src/allmydata/test/test_checker.py
+++ b/src/allmydata/test/test_checker.py
@@ -289,7 +289,7 @@ class BalancingAct(GridTestMixin, unittest.TestCase):
         self.g.add_server(server_number, ss)
 
     def add_server_with_share(self, server_number, uri, share_number=None,
-                               readonly=False):
+                              readonly=False):
         self.add_server(server_number, readonly)
         if share_number is not None:
             self.copy_share_to_server(uri, share_number, server_number)
@@ -322,13 +322,14 @@ class BalancingAct(GridTestMixin, unittest.TestCase):
         assert len(self.g.servers_by_number) < len(letters), \
             "This little printing function is only meant for < 26 servers"
         shares_chart = {}
-        names = dict(zip([ss.my_nodeid for _,ss in 
-                          self.g.servers_by_number.iteritems()], letters))
+        names = dict(zip([ss.my_nodeid
+                          for _,ss in self.g.servers_by_number.iteritems()],
+                         letters))
         for shnum, serverid, _ in self.find_uri_shares(uri):
             shares_chart.setdefault(shnum, []).append(names[serverid])
         return shares_chart
 
-    def test_1115(self):
+    def test_good_share_hosts(self):
         self.basedir = "checker/BalancingAct/1115"
         self.set_up_grid(num_servers=1)
         c0 = self.g.clients[0]
@@ -354,17 +355,18 @@ class BalancingAct(GridTestMixin, unittest.TestCase):
             #print self._pretty_shares_chart(self.uri)
         for i in range(1,5):
             d.addCallback(add_three, i)
-    
+
         def _check_and_repair(_):
             return self.imm.check_and_repair(Monitor())
         def _check_counts(crr, shares_good, good_share_hosts):
             p_crr = crr.get_post_repair_results().data
             #print self._pretty_shares_chart(self.uri)
-            self.failUnless(p_crr['count-shares-good'] == shares_good)
-            self.failUnless(p_crr['count-good-share-hosts'] == good_share_hosts)
+            self.failUnlessEqual(p_crr['count-shares-good'], shares_good)
+            self.failUnlessEqual(p_crr['count-good-share-hosts'],
+                                 good_share_hosts)
 
         """
-        Initial sharemap: 
+        Initial sharemap:
             0:[A] 1:[A] 2:[A] 3:[A,B,C,D,E]
           4 good shares, but 5 good hosts
         After deleting all instances of share #3 and repairing:
@@ -376,8 +378,8 @@ class BalancingAct(GridTestMixin, unittest.TestCase):
         d.addCallback(lambda _: self.delete_shares_numbered(self.uri, [3]))
         d.addCallback(_check_and_repair)
         d.addCallback(_check_counts, 4, 5)
-        d.addCallback(lambda _: [self.g.break_server(sid) for sid 
-                                 in self.g.get_all_serverids()])
+        d.addCallback(lambda _: [self.g.break_server(sid)
+                                 for sid in self.g.get_all_serverids()])
         d.addCallback(_check_and_repair)
         d.addCallback(_check_counts, 0, 0)
         return d