X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4d52d030d964a986d28cc0f35f74624a41406fb0..163c8f8750193b791eb62f5a8d73dc44a006b69e:/services/keepstore/trash_worker.go diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go index cbb831ebc0..8a9fedfb70 100644 --- a/services/keepstore/trash_worker.go +++ b/services/keepstore/trash_worker.go @@ -51,24 +51,24 @@ func TrashItem(trashRequest TrashRequest) { for _, volume := range volumes { mtime, err := volume.Mtime(trashRequest.Locator) if err != nil { - log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err) + log.Printf("%v Trash(%v): %v", volume, trashRequest.Locator, err) continue } if trashRequest.BlockMtime != mtime.UnixNano() { - log.Printf("%v Delete(%v): stored mtime %v does not match trash list value %v", volume, trashRequest.Locator, mtime.UnixNano(), trashRequest.BlockMtime) + log.Printf("%v Trash(%v): stored mtime %v does not match trash list value %v", volume, trashRequest.Locator, mtime.UnixNano(), trashRequest.BlockMtime) continue } if !theConfig.EnableDelete { - err = errors.New("did not delete block because EnableDelete is false") + err = errors.New("skipping because EnableDelete is false") } else { err = volume.Trash(trashRequest.Locator) } if err != nil { - log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err) + log.Printf("%v Trash(%v): %v", volume, trashRequest.Locator, err) } else { - log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator) + log.Printf("%v Trash(%v) OK", volume, trashRequest.Locator) } } }