6221: Check never_delete must be true.

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index e55e0ef841495724b26a4e89cdf84e11d0051a7e..3dfdce20e321bfe61ffb9b9f119e10f189ee2c48 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -288,6 +288,10 @@ func main() {
 
        flag.Parse()
 
+       if never_delete != true {
+               log.Fatal("never_delete must be true, see #6221")
+       }
+
        if maxBuffers < 0 {
                log.Fatal("-max-buffers must be greater than zero.")
        }

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 52f5e7534578d27ddf1d72c51b3258a72950c56d..6257f7b4700dae6c5e3972aca0ba9b7b7332ad54 100644 (file)
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -39,16 +39,16 @@ func TrashItem(trashRequest TrashRequest) {
                        continue
                }
 
-               if !never_delete {
-                       err = volume.Delete(trashRequest.Locator)
-               } else {
+               if never_delete {
                        err = errors.New("did not delete block because never_delete is true")
+               } else {
+                       err = volume.Delete(trashRequest.Locator)
                }
 
-               if err == nil {
-                       log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator)
-               } else {
+               if err != nil {
                        log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err)
+               } else {
+                       log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator)
                }
        }
 }