8178: All three currently supported volumes return error when trash-lifetime period...

Returning an error is causing test failures in unix volume and hence is still a work in progress.

diff --git a/services/keepstore/azure_blob_volume.go b/services/keepstore/azure_blob_volume.go
index 0071567afabed21084abce843038929a03afbaf8..f135835074e5e7eec5314a25daddceddd1dc2194 100644 (file)
--- a/services/keepstore/azure_blob_volume.go
+++ b/services/keepstore/azure_blob_volume.go
@@ -43,6 +43,11 @@ type azureVolumeAdder struct {
 }
 
 func (s *azureVolumeAdder) Set(containerName string) error {
+       if trashLifetime <= 0 {
+               log.Print("Missing required configuration parameter: trash-lifetime")
+               return ErrNotImplemented
+       }
+
        if containerName == "" {
                return errors.New("no container name given")
        }

diff --git a/services/keepstore/keepstore_test.go b/services/keepstore/keepstore_test.go
index 2a1c3d243ab922855b2bf6344f69631a78272662..746d99efd0673f4b646ce12891a0a90cf552dcd6 100644 (file)
--- a/services/keepstore/keepstore_test.go
+++ b/services/keepstore/keepstore_test.go
@@ -335,6 +335,7 @@ func TestDiscoverTmpfs(t *testing.T) {
        f.Close()
        ProcMounts = f.Name()
 
+       trashLifetime = 24 * 60 * 60
        resultVols := volumeSet{}
        added := (&unixVolumeAdder{&resultVols}).Discover()
 
@@ -375,6 +376,7 @@ func TestDiscoverNone(t *testing.T) {
        f.Close()
        ProcMounts = f.Name()
 
+       trashLifetime = 24 * 60 * 60
        resultVols := volumeSet{}
        added := (&unixVolumeAdder{&resultVols}).Discover()
        if added != 0 || len(resultVols) != 0 {

diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index 16afc326b5f563171d44abfac731d9ce377da373..17cc194a5b9a45deaecb1312c084a8223211f554 100644 (file)
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -39,6 +39,10 @@ type s3VolumeAdder struct {
 }
 
 func (s *s3VolumeAdder) Set(bucketName string) error {
+       if trashLifetime <= 0 {
+               log.Print("Missing required configuration parameter: trash-lifetime")
+               return ErrNotImplemented
+       }
        if bucketName == "" {
                return fmt.Errorf("no container name given")
        }

diff --git a/services/keepstore/volume_unix.go b/services/keepstore/volume_unix.go
index da1d390279b3c0afe94a388c002275b0cf44790e..1be622c23f141d48f5d896d484fb8d62b95a2655 100644 (file)
--- a/services/keepstore/volume_unix.go
+++ b/services/keepstore/volume_unix.go
@@ -23,6 +23,10 @@ type unixVolumeAdder struct {
 }
 
 func (vs *unixVolumeAdder) Set(value string) error {
+       if trashLifetime <= 0 {
+               log.Print("Missing required configuration parameter: trash-lifetime")
+               //return ErrNotImplemented
+       }
        if dirs := strings.Split(value, ","); len(dirs) > 1 {
                log.Print("DEPRECATED: using comma-separated volume list.")
                for _, dir := range dirs {