7167: Fix up progress/ETA logging.

diff --git a/tools/keep-rsync/keep-rsync.go b/tools/keep-rsync/keep-rsync.go
index a5362879a95ee618e65353e864d451e2d5fbadd5..d47efd8ebf1127b2f58127b0d1c29e7889a43aa0 100644 (file)
--- a/tools/keep-rsync/keep-rsync.go
+++ b/tools/keep-rsync/keep-rsync.go
@@ -256,13 +256,18 @@ func getMissingLocators(srcLocators, dstLocators map[string]bool) []string {
 
 // Copy blocks from src to dst; only those that are missing in dst are copied
 func copyBlocksToDst(toBeCopied []string, kcSrc, kcDst *keepclient.KeepClient, blobSigningKey string) error {
-       done := 0
        total := len(toBeCopied)
 
        startedAt := time.Now()
-       var blockTime int64
-       for _, locator := range toBeCopied {
-               log.Printf("Getting block %d of %d: %v", done+1, total, locator)
+       for done, locator := range toBeCopied {
+               if done == 0 {
+                       log.Printf("Copying data block %d of %d (%.2f%% done): %v", done+1, total,
+                               float64(done)/float64(total)*100, locator)
+               } else {
+                       timePerBlock := time.Since(startedAt) / time.Duration(done)
+                       log.Printf("Copying data block %d of %d (%.2f%% done, ETA %v): %v", done+1, total,
+                               float64(done)/float64(total)*100, timePerBlock*time.Duration(total-done), locator)
+               }
 
                getLocator := locator
                expiresAt := time.Now().AddDate(0, 0, 1)
@@ -275,23 +280,10 @@ func copyBlocksToDst(toBeCopied []string, kcSrc, kcDst *keepclient.KeepClient, b
                        return fmt.Errorf("Error getting block: %v %v", locator, err)
                }
 
-               if done == 0 {
-                       log.Printf("Copying data block %d of %d (%.2f%% done): %v", done+1, total,
-                               float64(done)/float64(total)*100, locator)
-               } else {
-                       log.Printf("Copying data block %d of %d (%.2f%% done, ETA %v): %v", done+1, total,
-                               float64(done)/float64(total)*100, time.Duration(blockTime*int64(total-done)), locator)
-               }
                _, _, err = kcDst.PutHR(getLocator[:32], reader, len)
                if err != nil {
                        return fmt.Errorf("Error copying data block: %v %v", locator, err)
                }
-
-               if done == 0 {
-                       blockTime = int64(time.Now().Sub(startedAt))
-               }
-
-               done++
        }
 
        log.Printf("Successfully copied to destination %d blocks.", total)