From: robk-tahoe <robk-tahoe@allmydata.com>
Date: Mon, 24 Mar 2008 22:46:28 +0000 (-0700)
Subject: mutable: revise a couple of error messages
X-Git-Tag: allmydata-tahoe-1.0.0~9
X-Git-Url: https://git.rkrishnan.org/listings/pb3calculator.py?a=commitdiff_plain;h=d25d3065d1bb265b4f84195b2e1b6c1dc3317a4e;p=tahoe-lafs%2Ftahoe-lafs.git

mutable: revise a couple of error messages

at brian and zooko's suggestion, reword an error message encountered when
multiple writers are racing to make overlapping changes to a directory
---

diff --git a/src/allmydata/mutable.py b/src/allmydata/mutable.py
index 2285397b..981cb86f 100644
--- a/src/allmydata/mutable.py
+++ b/src/allmydata/mutable.py
@@ -1221,13 +1221,13 @@ class Publish:
             for oldplace in current_share_peers.get(shnum, []):
                 (peerid, seqnum, R) = oldplace
                 if seqnum >= self._new_seqnum:
-                    self.log("somebody has a newer sequence number than what we were uploading",
+                    self.log("the sequence number has changed unexpectedly",
                              level=log.WEIRD)
                     self.log(format="peerid=%(peerid)s, theirs=%(seqnum)d, mine=%(new_seqnum)d",
                              peerid=idlib.shortnodeid_b2a(peerid),
                              seqnum=seqnum,
                              new_seqnum=self._new_seqnum)
-                    raise UncoordinatedWriteError("somebody has a newer sequence number than us")
+                    raise UncoordinatedWriteError("the sequence number has changed unexpectedly")
                 target_map.add(shnum, oldplace)
                 shares_per_peer.add(peerid, shnum)
                 if shnum in shares_needing_homes: