X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fed6d3b24a6c49df01601dfdc27182fd0770b013..5912867d965664504148f12cff801836a56f0162:/services/keepstore/trash_worker_test.go?ds=sidebyside diff --git a/services/keepstore/trash_worker_test.go b/services/keepstore/trash_worker_test.go index dee8f174c1..40b291e6f3 100644 --- a/services/keepstore/trash_worker_test.go +++ b/services/keepstore/trash_worker_test.go @@ -2,8 +2,6 @@ package main import ( "container/list" - "git.curoverse.com/arvados.git/sdk/go/arvadosclient" - "log" "testing" "time" ) @@ -17,11 +15,11 @@ type TrashWorkerTestData struct { Block2 []byte BlockMtime2 int64 - CreateData bool - CreateInVolume1 bool - UseDelayToCreate bool + CreateData bool + CreateInVolume1 bool - UseDefaultTrashTime bool + UseTrashLifeTime bool + DifferentMtimes bool DeleteLocator string @@ -33,6 +31,7 @@ type TrashWorkerTestData struct { Expect no errors. */ func TestTrashWorkerIntegration_GetNonExistingLocator(t *testing.T) { + never_delete = false testData := TrashWorkerTestData{ Locator1: "5d41402abc4b2a76b9719d911017c592", Block1: []byte("hello"), @@ -54,6 +53,7 @@ func TestTrashWorkerIntegration_GetNonExistingLocator(t *testing.T) { Expect the second locator in volume 2 to be unaffected. */ func TestTrashWorkerIntegration_LocatorInVolume1(t *testing.T) { + never_delete = false testData := TrashWorkerTestData{ Locator1: TEST_HASH, Block1: TEST_BLOCK, @@ -75,6 +75,7 @@ func TestTrashWorkerIntegration_LocatorInVolume1(t *testing.T) { Expect the first locator in volume 1 to be unaffected. */ func TestTrashWorkerIntegration_LocatorInVolume2(t *testing.T) { + never_delete = false testData := TrashWorkerTestData{ Locator1: TEST_HASH, Block1: TEST_BLOCK, @@ -96,6 +97,7 @@ func TestTrashWorkerIntegration_LocatorInVolume2(t *testing.T) { Expect locator to be deleted from both volumes. */ func TestTrashWorkerIntegration_LocatorInBothVolumes(t *testing.T) { + never_delete = false testData := TrashWorkerTestData{ Locator1: TEST_HASH, Block1: TEST_BLOCK, @@ -117,6 +119,7 @@ func TestTrashWorkerIntegration_LocatorInBothVolumes(t *testing.T) { Delete the second and expect the first to be still around. */ func TestTrashWorkerIntegration_MtimeMatchesForLocator1ButNotForLocator2(t *testing.T) { + never_delete = false testData := TrashWorkerTestData{ Locator1: TEST_HASH, Block1: TEST_BLOCK, @@ -124,8 +127,8 @@ func TestTrashWorkerIntegration_MtimeMatchesForLocator1ButNotForLocator2(t *test Locator2: TEST_HASH, Block2: TEST_BLOCK, - CreateData: true, - UseDelayToCreate: true, + CreateData: true, + DifferentMtimes: true, DeleteLocator: TEST_HASH, @@ -140,6 +143,7 @@ func TestTrashWorkerIntegration_MtimeMatchesForLocator1ButNotForLocator2(t *test Expect the other unaffected. */ func TestTrashWorkerIntegration_TwoDifferentLocatorsInVolume1(t *testing.T) { + never_delete = false testData := TrashWorkerTestData{ Locator1: TEST_HASH, Block1: TEST_BLOCK, @@ -158,10 +162,11 @@ func TestTrashWorkerIntegration_TwoDifferentLocatorsInVolume1(t *testing.T) { performTrashWorkerTest(testData, t) } -/* Allow defaultTrashLifetime to be used. Thus, the newly created block +/* Allow default Trash Life time to be used. Thus, the newly created block will not be deleted becuase its Mtime is within the trash life time. */ func TestTrashWorkerIntegration_SameLocatorInTwoVolumesWithDefaultTrashLifeTime(t *testing.T) { + never_delete = false testData := TrashWorkerTestData{ Locator1: TEST_HASH, Block1: TEST_BLOCK, @@ -172,11 +177,33 @@ func TestTrashWorkerIntegration_SameLocatorInTwoVolumesWithDefaultTrashLifeTime( CreateData: true, CreateInVolume1: true, - UseDefaultTrashTime: true, + UseTrashLifeTime: true, DeleteLocator: TEST_HASH, // locator 1 - // Since defaultTrashLifetime is in effect, block won't be deleted. + // Since trash life time is in effect, block won't be deleted. + ExpectLocator1: true, + ExpectLocator2: true, + } + performTrashWorkerTest(testData, t) +} + +/* Delete a block with matching mtime for locator in both volumes, but never_delete is true, + so block won't be deleted. +*/ +func TestTrashWorkerIntegration_NeverDelete(t *testing.T) { + never_delete = true + testData := TrashWorkerTestData{ + Locator1: TEST_HASH, + Block1: TEST_BLOCK, + + Locator2: TEST_HASH, + Block2: TEST_BLOCK, + + CreateData: true, + + DeleteLocator: TEST_HASH, + ExpectLocator1: true, ExpectLocator2: true, } @@ -187,21 +214,14 @@ func TestTrashWorkerIntegration_SameLocatorInTwoVolumesWithDefaultTrashLifeTime( func performTrashWorkerTest(testData TrashWorkerTestData, t *testing.T) { // Create Keep Volumes KeepVM = MakeTestVolumeManager(2) - - // Delete from volume will not take place if the block MTime is within permission_ttl - permission_ttl = time.Duration(1) * time.Second + defer KeepVM.Close() // Put test content - vols := KeepVM.Volumes() + vols := KeepVM.AllWritable() if testData.CreateData { vols[0].Put(testData.Locator1, testData.Block1) vols[0].Put(testData.Locator1+".meta", []byte("metadata")) - // One of the tests deletes a locator with different Mtimes in two different volumes - if testData.UseDelayToCreate { - time.Sleep(1 * time.Second) - } - if testData.CreateInVolume1 { vols[0].Put(testData.Locator2, testData.Block2) vols[0].Put(testData.Locator2+".meta", []byte("metadata")) @@ -211,34 +231,63 @@ func performTrashWorkerTest(testData TrashWorkerTestData, t *testing.T) { } } + oldBlockTime := time.Now().Add(-blob_signature_ttl - time.Minute) + // Create TrashRequest for the test trashRequest := TrashRequest{ Locator: testData.DeleteLocator, - BlockMtime: time.Now().Unix(), + BlockMtime: oldBlockTime.Unix(), } - // delay by permission_ttl to allow deletes to work - time.Sleep(1 * time.Second) - // Run trash worker and put the trashRequest on trashq trashList := list.New() trashList.PushBack(trashRequest) trashq = NewWorkQueue() + defer trashq.Close() + + if !testData.UseTrashLifeTime { + // Trash worker would not delete block if its Mtime is + // within trash life time. Back-date the block to + // allow the deletion to succeed. + for _, v := range vols { + v.(*MockVolume).Timestamps[testData.DeleteLocator] = oldBlockTime + if testData.DifferentMtimes { + oldBlockTime = oldBlockTime.Add(time.Second) + } + } + } + go RunTrashWorker(trashq) - // Trash worker would not delete block if its Mtime is within defaultTrashLifetime - // Hence, we will have to bypass it to allow the deletion to succeed. - if !testData.UseDefaultTrashTime { - go RunTrashWorker(nil, trashq) - } else { - arv, err := arvadosclient.MakeArvadosClient() - if err != nil { - log.Fatalf("Error setting up arvados client %s", err.Error()) + // Install gate so all local operations block until we say go + gate := make(chan struct{}) + for _, v := range vols { + v.(*MockVolume).Gate = gate + } + + assertStatusItem := func(k string, expect float64) { + if v := getStatusItem("TrashQueue", k); v != expect { + t.Errorf("Got %s %v, expected %v", k, v, expect) } - go RunTrashWorker(&arv, trashq) } + assertStatusItem("InProgress", 0) + assertStatusItem("Queued", 0) + + listLen := trashList.Len() trashq.ReplaceQueue(trashList) - time.Sleep(10 * time.Millisecond) // give a moment to finish processing the list + + // Wait for worker to take request(s) + expectEqualWithin(t, time.Second, listLen, func() interface{} { return trashq.Status().InProgress }) + + // Ensure status.json also reports work is happening + assertStatusItem("InProgress", float64(1)) + assertStatusItem("Queued", float64(listLen-1)) + + // Let worker proceed + close(gate) + + // Wait for worker to finish + expectEqualWithin(t, time.Second, 0, func() interface{} { return trashq.Status().InProgress }) // Verify Locator1 to be un/deleted as expected data, _ := GetBlock(testData.Locator1, false) @@ -266,22 +315,18 @@ func performTrashWorkerTest(testData TrashWorkerTestData, t *testing.T) { } } - // One test used the same locator in two different volumes but with different Mtime values - // Hence let's verify that only one volume has it and the other is deleted - if (testData.ExpectLocator1) && - (testData.Locator1 == testData.Locator2) { + // The DifferentMtimes test puts the same locator in two + // different volumes, but only one copy has an Mtime matching + // the trash request. + if testData.DifferentMtimes { locatorFoundIn := 0 - for _, volume := range KeepVM.Volumes() { + for _, volume := range KeepVM.AllReadable() { if _, err := volume.Get(testData.Locator1); err == nil { locatorFoundIn = locatorFoundIn + 1 } } if locatorFoundIn != 1 { - t.Errorf("Expected locator to be found in only one volume after deleting. But found: %s", locatorFoundIn) + t.Errorf("Found %d copies of %s, expected 1", locatorFoundIn, testData.Locator1) } } - - // Done - trashq.Close() - KeepVM.Quit() }