Merge branch 'master' into 8183-projects-dropdown

[arvados.git] / services / keepstore / volume_unix.go

diff --git a/services/keepstore/volume_unix.go b/services/keepstore/volume_unix.go
index 1be622c23f141d48f5d896d484fb8d62b95a2655..0dd1d82a98ca4b9f14c79d8b96e90f10faf4311f 100644 (file)
--- a/services/keepstore/volume_unix.go
+++ b/services/keepstore/volume_unix.go
@@ -23,9 +23,8 @@ type unixVolumeAdder struct {
 }
 
 func (vs *unixVolumeAdder) Set(value string) error {
-       if trashLifetime <= 0 {
-               log.Print("Missing required configuration parameter: trash-lifetime")
-               //return ErrNotImplemented
+       if trashLifetime != 0 {
+               return ErrNotImplemented
        }
        if dirs := strings.Split(value, ","); len(dirs) > 1 {
                log.Print("DEPRECATED: using comma-separated volume list.")
@@ -379,6 +378,9 @@ func (v *UnixVolume) Trash(loc string) error {
        if v.readonly {
                return MethodDisabledError
        }
+       if trashLifetime != 0 {
+               return ErrNotImplemented
+       }
        if v.locker != nil {
                v.locker.Lock()
                defer v.locker.Unlock()
@@ -412,7 +414,7 @@ func (v *UnixVolume) Trash(loc string) error {
 // Untrash moves block from trash back into store
 // TBD
 func (v *UnixVolume) Untrash(loc string) error {
-       return nil
+       return ErrNotImplemented
 }
 
 // blockDir returns the fully qualified directory name for the directory