[ARVADOS] updated: b9d5f6444ca07c09d4d75ba3fb87271137e5f981

[Git user]

Summary of changes:
 services/keepstore/azure_blob_volume.go      | 7 ++++---
 services/keepstore/azure_blob_volume_test.go | 1 +
 services/keepstore/volume_generic_test.go    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

       via  b9d5f6444ca07c09d4d75ba3fb87271137e5f981 (commit)
      from  a0c7339018d20f9f2c0064c841053f6f1d1a2ccd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b9d5f6444ca07c09d4d75ba3fb87271137e5f981
Author: radhika <radhika at curoverse.com>
Date:   Wed May 4 16:26:13 2016 -0400

    8556: Omit trashed blobs from IndexTo response.

diff --git a/services/keepstore/azure_blob_volume.go b/services/keepstore/azure_blob_volume.go
index 7c8f8aa..e111d96 100644
--- a/services/keepstore/azure_blob_volume.go
+++ b/services/keepstore/azure_blob_volume.go
@@ -351,9 +351,10 @@ func (v *AzureBlobVolume) IndexTo(prefix string, writer io.Writer) error {
 				// value.
 				continue
 			}
-			//if b.Metadata["expired_at"] != "" {
-			//	continue
-			//}
+			if b.Metadata["expires_at"] != "" {
+				// Trashed blob; exclude it from response
+				continue
+			}
 			fmt.Fprintf(writer, "%s+%d %d\n", b.Name, b.Properties.ContentLength, t.Unix())
 		}
 		if resp.NextMarker == "" {
diff --git a/services/keepstore/azure_blob_volume_test.go b/services/keepstore/azure_blob_volume_test.go
index a309462..5195507 100644
--- a/services/keepstore/azure_blob_volume_test.go
+++ b/services/keepstore/azure_blob_volume_test.go
@@ -295,6 +295,7 @@ func (h *azStubHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 						ContentLength: int64(len(blob.Data)),
 						Etag:          blob.Etag,
 					},
+					Metadata: blob.Metadata,
 				})
 			}
 		}
diff --git a/services/keepstore/volume_generic_test.go b/services/keepstore/volume_generic_test.go
index 0f289ef..b31b236 100644
--- a/services/keepstore/volume_generic_test.go
+++ b/services/keepstore/volume_generic_test.go
@@ -830,7 +830,7 @@ func testTrashEmptyTrashUntrash(t TB, factory TestableVolumeFactory) {
 	indexBuf := new(bytes.Buffer)
 	v.IndexTo("", indexBuf)
 	if strings.Contains(string(indexBuf.Bytes()), TestHash) {
-		//t.Fatalf("Found trashed block in IndexTo")
+		t.Fatalf("Found trashed block in IndexTo")
 	}
 
 	err = v.Touch(TestHash)

-----------------------------------------------------------------------


hooks/post-receive
--