From: Brian Warner <warner@lothar.com>
Date: Fri, 24 Oct 2008 20:21:28 +0000 (-0700)
Subject: mutable: call remove_advise_corrupt_share when we see share corruption in mapupdate... 
X-Git-Url: https://git.rkrishnan.org/nxhtml.html?a=commitdiff_plain;h=9f21f7cf650ffe7df332064ebc9bee2394cce027;p=tahoe-lafs%2Ftahoe-lafs.git

mutable: call remove_advise_corrupt_share when we see share corruption in mapupdate/download/check, tolerate servers that do not implement it
---

diff --git a/src/allmydata/mutable/checker.py b/src/allmydata/mutable/checker.py
index 0a01cf89..e09050eb 100644
--- a/src/allmydata/mutable/checker.py
+++ b/src/allmydata/mutable/checker.py
@@ -90,6 +90,8 @@ class MutableChecker:
                 self.bad_shares.append( (peerid, shnum, f) )
                 prefix = data[:SIGNED_PREFIX_LENGTH]
                 servermap.mark_bad_share(peerid, shnum, prefix)
+                ss = servermap.connections[peerid]
+                self.notify_server_corruption(ss, shnum, str(f.value))
 
     def check_prefix(self, peerid, shnum, data):
         (seqnum, root_hash, IV, segsize, datalength, k, N, prefix,
@@ -135,6 +137,10 @@ class MutableChecker:
             if alleged_writekey != self._node.get_writekey():
                 raise CorruptShareError(peerid, shnum, "invalid privkey")
 
+    def notify_server_corruption(self, ss, shnum, reason):
+        ss.callRemoteOnly("advise_corrupt_share",
+                          "mutable", self._storage_index, shnum, reason)
+
     def _count_shares(self, smap, version):
         available_shares = smap.shares_available()
         (num_distinct_shares, k, N) = available_shares[version]
diff --git a/src/allmydata/mutable/retrieve.py b/src/allmydata/mutable/retrieve.py
index b5391eb3..300475e0 100644
--- a/src/allmydata/mutable/retrieve.py
+++ b/src/allmydata/mutable/retrieve.py
@@ -268,6 +268,7 @@ class Retrieve:
                 self.log(format="bad share: %(f_value)s",
                          f_value=str(f.value), failure=f,
                          level=log.WEIRD, umid="7fzWZw")
+                self.notify_server_corruption(peerid, shnum, str(e))
                 self.remove_peer(peerid)
                 self.servermap.mark_bad_share(peerid, shnum, prefix)
                 self._bad_shares.add( (peerid, shnum) )
@@ -279,6 +280,11 @@ class Retrieve:
                 self._try_to_validate_privkey(datav[2], peerid, shnum, lp)
         # all done!
 
+    def notify_server_corruption(self, peerid, shnum, reason):
+        ss = self.servermap.connections[peerid]
+        ss.callRemoteOnly("advise_corrupt_share",
+                          "mutable", self._storage_index, shnum, reason)
+
     def _got_results_one_share(self, shnum, peerid,
                                got_prefix, got_hash_and_data):
         self.log("_got_results: got shnum #%d from peerid %s"
diff --git a/src/allmydata/mutable/servermap.py b/src/allmydata/mutable/servermap.py
index ad174bd2..f5373887 100644
--- a/src/allmydata/mutable/servermap.py
+++ b/src/allmydata/mutable/servermap.py
@@ -575,6 +575,7 @@ class ServermapUpdater:
                 f = failure.Failure()
                 self.log(format="bad share: %(f_value)s", f_value=str(f.value),
                          failure=f, parent=lp, level=log.WEIRD, umid="h5llHg")
+                self.notify_server_corruption(peerid, shnum, str(e))
                 self._bad_peers.add(peerid)
                 self._last_failure = f
                 checkstring = data[:SIGNED_PREFIX_LENGTH]
@@ -609,6 +610,11 @@ class ServermapUpdater:
         # all done!
         self.log("_got_results done", parent=lp, level=log.NOISY)
 
+    def notify_server_corruption(self, peerid, shnum, reason):
+        ss = self._servermap.connections[peerid]
+        ss.callRemoteOnly("advise_corrupt_share",
+                          "mutable", self._storage_index, shnum, reason)
+
     def _got_results_one_share(self, shnum, data, peerid, lp):
         self.log(format="_got_results: got shnum #%(shnum)d from peerid %(peerid)s",
                  shnum=shnum,
diff --git a/src/allmydata/test/test_mutable.py b/src/allmydata/test/test_mutable.py
index c34509ad..bcf0d088 100644
--- a/src/allmydata/test/test_mutable.py
+++ b/src/allmydata/test/test_mutable.py
@@ -117,6 +117,13 @@ class FakeStorageServer:
         d = fireEventually()
         d.addCallback(lambda res: _call())
         return d
+    def callRemoteOnly(self, methname, *args, **kwargs):
+        d = self.callRemote(methname, *args, **kwargs)
+        d.addBoth(lambda ignore: None)
+        pass
+
+    def advise_corrupt_share(self, share_type, storage_index, shnum, reason):
+        pass
 
     def slot_readv(self, storage_index, shnums, readv):
         d = self.storage.read(self.peerid, storage_index)