6260: Continue to force never_delete to be true until #6221 is resolved; in the meant...

diff --git a/services/datamanager/datamanager_test.go b/services/datamanager/datamanager_test.go
index 39e545dcb84248916e15baf6b1641725aad0dfb2..e876fa4b25eb309dc0af3debae9212550a9dca86 100644 (file)
--- a/services/datamanager/datamanager_test.go
+++ b/services/datamanager/datamanager_test.go
@@ -113,7 +113,7 @@ func createCollection(t *testing.T, data string) string {
 // Get collection locator
 var locatorMatcher = regexp.MustCompile(`^([0-9a-f]{32})\+(\d*)(.*)$`)
 
-func getCollectionLocator(t *testing.T, uuid string) string {
+func getFirstLocatorFromCollection(t *testing.T, uuid string) string {
        manifest := getCollection(t, uuid)["manifest_text"].(string)
 
        locator := strings.Split(manifest, " ")[1]
@@ -232,7 +232,7 @@ func verifyBlocks(t *testing.T, notExpected []string, expected []string) {
        }
 
        for _, block := range expected {
-               if blockExists[block] == nil || len(blockExists[block]) != 2 {
+               if blockExists[block] == nil || len(blockExists[block]) < 2 {
                        t.Fatalf("Expected to find two replicas for block %s; found %d", block, len(blockExists[block]))
                }
        }
@@ -386,25 +386,25 @@ func TestPutAndGetBlocks(t *testing.T) {
 
        // Create a collection that would be deleted later on
        toBeDeletedCollectionUuid := createCollection(t, "some data for collection creation")
-       toBeDeletedCollectionLocator := getCollectionLocator(t, toBeDeletedCollectionUuid)
+       toBeDeletedCollectionLocator := getFirstLocatorFromCollection(t, toBeDeletedCollectionUuid)
 
        // Create another collection that has the same data as the one of the old blocks
        oldUsedBlockCollectionUuid := createCollection(t, oldUsedBlockData)
-       oldUsedBlockCollectionLocator := getCollectionLocator(t, oldUsedBlockCollectionUuid)
+       oldUsedBlockCollectionLocator := getFirstLocatorFromCollection(t, oldUsedBlockCollectionUuid)
        if oldUsedBlockCollectionLocator != oldUsedBlockLocator {
                t.Fatalf("Locator of the collection with the same data as old block is different %s", oldUsedBlockCollectionLocator)
        }
 
        // Create another collection whose replication level will be changed
        replicationCollectionUuid := createCollection(t, "replication level on this collection will be reduced")
-       replicationCollectionLocator := getCollectionLocator(t, replicationCollectionUuid)
+       replicationCollectionLocator := getFirstLocatorFromCollection(t, replicationCollectionUuid)
 
        // Create two collections with same data; one will be deleted later on
        dataForTwoCollections := "one of these collections will be deleted"
        oneOfTwoWithSameDataUuid := createCollection(t, dataForTwoCollections)
-       oneOfTwoWithSameDataLocator := getCollectionLocator(t, oneOfTwoWithSameDataUuid)
+       oneOfTwoWithSameDataLocator := getFirstLocatorFromCollection(t, oneOfTwoWithSameDataUuid)
        secondOfTwoWithSameDataUuid := createCollection(t, dataForTwoCollections)
-       secondOfTwoWithSameDataLocator := getCollectionLocator(t, secondOfTwoWithSameDataUuid)
+       secondOfTwoWithSameDataLocator := getFirstLocatorFromCollection(t, secondOfTwoWithSameDataUuid)
        if oneOfTwoWithSameDataLocator != secondOfTwoWithSameDataLocator {
                t.Fatalf("Locators for both these collections expected to be same: %s %s", oneOfTwoWithSameDataLocator, secondOfTwoWithSameDataLocator)
        }
@@ -480,7 +480,7 @@ func TestPutAndGetBlocks(t *testing.T) {
        verifyBlocks(t, oldUnusedBlockLocators, expected)
 }
 
-func _TestDatamanagerSingleRunRepeatedly(t *testing.T) {
+func TestDatamanagerSingleRunRepeatedly(t *testing.T) {
        log.Print("TestDatamanagerSingleRunRepeatedly start")
 
        defer TearDownDataManagerTest(t)
@@ -495,8 +495,8 @@ func _TestDatamanagerSingleRunRepeatedly(t *testing.T) {
        }
 }
 
-func _TestGetStatusRepeatedly(t *testing.T) {
-       log.Print("TestGetStatusRepeatedly start")
+func TestGetStatusRepeatedly(t *testing.T) {
+       t.Skip("This test still fails. Skip it until it is fixed.")
 
        defer TearDownDataManagerTest(t)
        SetupDataManagerTest(t)

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index e55e0ef841495724b26a4e89cdf84e11d0051a7e..593035717bf65f041327a7d14209277d6338d231 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -35,6 +35,10 @@ const BLOCKSIZE = 64 * 1024 * 1024
 // in order to permit writes.
 const MIN_FREE_KILOBYTES = BLOCKSIZE / 1024
 
+// Until #6221 is resolved, never_delete must be true.
+// However, allow it to be false in testing.
+const TEST_DATA_MANAGER_TOKEN = "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h"
+
 var PROC_MOUNTS = "/proc/mounts"
 
 // enforce_permissions controls whether permission signatures
@@ -338,6 +342,11 @@ func main() {
                        log.Fatalf("reading data manager token: %s\n", err)
                }
        }
+
+       if never_delete != true && data_manager_token != TEST_DATA_MANAGER_TOKEN {
+               log.Fatal("never_delete must be true, see #6221")
+       }
+
        if blob_signing_key_file != "" {
                if buf, err := ioutil.ReadFile(blob_signing_key_file); err == nil {
                        PermissionSecret = bytes.TrimSpace(buf)