Changeset 461f9464 in trunk

Timestamp:

2010-07-19T04:46:55Z (15 years ago)

Author:

david-sarah <david-sarah@…>

Branches:

master

Children:

13b5e44

Parents:

ac29012

Message:

upload.py: fix #1118 by aborting newly-homeless buckets when reassignment runs. This makes a previously failing assert correct. This version refactors 'abort' into two methods, rather than using a default argument.

File:

• src/allmydata/immutable/upload.py (modified) (3 diffs)

src/allmydata/immutable/upload.py ¶

@@ -138 +138 @@
     def abort(self):
         """
-        I abort the remote bucket writers for the share numbers in
-        sharenums. This is a good idea to conserve space on the storage
-        server.
-        """
-        for writer in self.buckets.itervalues(): writer.abort()
+        I abort the remote bucket writers for all shares. This is a good idea
+        to conserve space on the storage server.
+        """
+        self.abort_some_buckets(self.buckets.keys())
+
+    def abort_some_buckets(self, sharenums):
+        """
+        I abort the remote bucket writers for the share numbers in sharenums.
+        """
+        for sharenum in sharenums:
+            if sharenum in self.buckets:
+                self.buckets[sharenum].abort()
+                del self.buckets[sharenum]
 
 
@@ -357 +365 @@
                                 del self.preexisting_shares[share]
                             items.append((server, sharelist))
+                        for writer in self.use_peers:
+                            writer.abort_some_buckets(self.homeless_shares)
                     return self._loop()
                 else:
@@ -365 +375 @@
                                           self.servers_of_happiness,
                                           effective_happiness)
+                    log.msg("server selection unsuccessful for %r: %s (%s), merged=%r"
+                            % (self, msg, self._get_progress_message(), merged), level=log.INFREQUENT)
                     return self._failed("%s (%s)" % (msg, self._get_progress_message()))