encode/upload: add more logging, to understand the test failure on a slow buildslave

diff --git a/src/allmydata/encode.py b/src/allmydata/encode.py
index 7d958b378960fad3810417e5557ee3d7b48579d3..b183a13241e2166714fa808ff3354f01d6def880 100644 (file)
--- a/src/allmydata/encode.py
+++ b/src/allmydata/encode.py
@@ -233,6 +233,7 @@ class Encoder(object):
         return sh.callRemote("put_block", segment_num, subshare)
 
     def send_all_subshare_hash_trees(self):
+        log.msg("%s sending hash trees" % self)
         dl = []
         for shareid,hashes in enumerate(self.subshare_hashes):
             # hashes is a list of the hashes of all subshares that were sent
@@ -280,4 +281,5 @@ class Encoder(object):
         return defer.DeferredList(dl)
 
     def done(self):
+        log.msg("%s: upload done" % self)
         return self.root_hash

diff --git a/src/allmydata/upload.py b/src/allmydata/upload.py
index bb8b83290ac4682f940ba5a2a5458d5c454bee46..fac636ac3fa4e04463bbd232a868da4dde9ef9fa 100644 (file)
--- a/src/allmydata/upload.py
+++ b/src/allmydata/upload.py
@@ -129,12 +129,12 @@ class FileUploader:
         log.msg(" still need homes for %d shares, still have %d usable peers" % (len(self.unallocated_sharenums), len(self.usable_peers)))
         if not self.unallocated_sharenums:
             # Finished allocating places for all shares.
-            log.msg("%s._locate_all_shareholders() Finished allocating places for all shares.")
+            log.msg("%s._locate_all_shareholders() Finished allocating places for all shares." % self)
             log.msg("used_peers is %s" % (self.used_peers,))
             return self.used_peers
         if not self.usable_peers:
             # Ran out of peers who have space.
-            log.msg("%s._locate_all_shareholders() Ran out of peers who have space.")
+            log.msg("%s._locate_all_shareholders() Ran out of peers who have space." % self)
             if len(self.unallocated_sharenums) < (self.total_shares - self.shares_of_happiness):
                 # But we allocated places for enough shares.
                 log.msg("%s._locate_all_shareholders() But we allocated places for enough shares.")