projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 6473-fetch-events-starting-at
[arvados.git]
/
services
/
keepstore
/
trash_worker.go
diff --git
a/services/keepstore/trash_worker.go
b/services/keepstore/trash_worker.go
index bc1775f97eb3e0c700c8197fa5b21b77ecc019e0..6257f7b4700dae6c5e3972aca0ba9b7b7332ad54 100644
(file)
--- a/
services/keepstore/trash_worker.go
+++ b/
services/keepstore/trash_worker.go
@@
-1,6
+1,7
@@
package main
import (
package main
import (
+ "errors"
"log"
"time"
)
"log"
"time"
)
@@
-37,11
+38,17
@@
func TrashItem(trashRequest TrashRequest) {
if err != nil || trashRequest.BlockMtime != mtime.Unix() {
continue
}
if err != nil || trashRequest.BlockMtime != mtime.Unix() {
continue
}
- err = volume.Delete(trashRequest.Locator)
+
+ 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): %v", volume, trashRequest.Locator, err)
if err != nil {
log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err)
- continue
+ } else {
+ log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator)
}
}
- log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator)
}
}
}
}