make status of finished operations consistently "Finished"

diff --git a/src/allmydata/immutable/encode.py b/src/allmydata/immutable/encode.py
index 5629a8b855d24e359bc9c897b65eba996b875276..bb0b79ee62326adb9d005001767e3b363d8ab5b0 100644 (file)
--- a/src/allmydata/immutable/encode.py
+++ b/src/allmydata/immutable/encode.py
@@ -637,7 +637,7 @@ class Encoder(object):
 
     def done(self, res):
         self.log("upload done", level=log.OPERATIONAL)
-        self.set_status("Done")
+        self.set_status("Finished")
         self.set_encode_and_push_progress(extra=1.0) # done
         now = time.time()
         h_and_c_elapsed = now - self._start_hashing_and_close_timestamp

diff --git a/src/allmydata/immutable/upload.py b/src/allmydata/immutable/upload.py
index 11f822bef942b6c972cda6db13c6dd3e79ffba45..0b3bd7d9437bc051710fc0ea75b1f032e3e5b445 100644 (file)
--- a/src/allmydata/immutable/upload.py
+++ b/src/allmydata/immutable/upload.py
@@ -838,7 +838,7 @@ class LiteralUploader:
 
     def _build_results(self, uri):
         self._results.uri = uri
-        self._status.set_status("Done")
+        self._status.set_status("Finished")
         self._status.set_progress(1, 1.0)
         self._status.set_progress(2, 1.0)
         return self._results
@@ -1038,7 +1038,7 @@ class AssistedUploader:
         if "total" in r.timings:
             r.timings["helper_total"] = r.timings["total"]
         r.timings["total"] = now - self._started
-        self._upload_status.set_status("Done")
+        self._upload_status.set_status("Finished")
         self._upload_status.set_results(r)
         return r
 

diff --git a/src/allmydata/mutable/publish.py b/src/allmydata/mutable/publish.py
index fd1b66db7f17cbd4de728dd9c100ade069ea382e..e9b68cd7447b335360a580414704a06e5e67c775 100644 (file)
--- a/src/allmydata/mutable/publish.py
+++ b/src/allmydata/mutable/publish.py
@@ -820,7 +820,7 @@ class Publish:
             # TODO: recovery
         else:
             self.log("Publish done, success")
-            self._status.set_status("Done")
+            self._status.set_status("Finished")
             self._status.set_progress(1.0)
         eventually(self.done_deferred.callback, res)
 

diff --git a/src/allmydata/mutable/retrieve.py b/src/allmydata/mutable/retrieve.py
index a72e1088b3c0e438b3b33ccbba4b49e49bff30b3..c90d1ce53b2c10c1c356bf9d5ef9cc072d3ad9a4 100644 (file)
--- a/src/allmydata/mutable/retrieve.py
+++ b/src/allmydata/mutable/retrieve.py
@@ -537,7 +537,7 @@ class Retrieve:
             self._status.set_status("Failed")
         else:
             self.log("Retrieve done, success!")
-            self._status.set_status("Done")
+            self._status.set_status("Finished")
             self._status.set_progress(1.0)
             # remember the encoding parameters, use them again next time
             (seqnum, root_hash, IV, segsize, datalength, k, N, prefix,

diff --git a/src/allmydata/mutable/servermap.py b/src/allmydata/mutable/servermap.py
index c8d684ff57f342fb496b2532d394ed87a4856428..474779a1ff839b19058c0e365567d8a2ce80276f 100644 (file)
--- a/src/allmydata/mutable/servermap.py
+++ b/src/allmydata/mutable/servermap.py
@@ -1008,7 +1008,7 @@ class ServermapUpdater:
         self._status.set_finished(now)
         self._status.timings["total"] = elapsed
         self._status.set_progress(1.0)
-        self._status.set_status("Done")
+        self._status.set_status("Finished")
         self._status.set_active(False)
 
         self._servermap.last_update_mode = self.mode