var err error
arv, err = arvadosclient.MakeArvadosClient()
if err != nil {
- t.Fatal("Error creating arv")
+ t.Fatalf("Error setting up arvados client: %s", err)
}
// keep client
keepClient = &keepclient.KeepClient{
Arvados: &arv,
- Want_replicas: 1,
+ Want_replicas: 2,
Using_proxy: true,
Client: &http.Client{},
}
// discover keep services
if err := keepClient.DiscoverKeepServers(); err != nil {
- t.Fatal("Error discovering keep services")
+ t.Fatalf("Error discovering keep services: %s", err)
}
for _, host := range keepClient.LocalRoots() {
keepServers = append(keepServers, host)
arvadostest.StopAPI()
}
-func PutBlock(t *testing.T, data string) string {
+func putBlock(t *testing.T, data string) string {
locator, _, err := keepClient.PutB([]byte(data))
if err != nil {
t.Fatalf("Error putting test data for %s %s %v", data, locator, err)
t.Fatalf("No locator found after putting test data")
}
- return locator
+ splits := strings.Split(locator, "+")
+ return splits[0] + "+" + splits[1]
}
-func GetBlock(t *testing.T, locator string, data string) {
+func getBlock(t *testing.T, locator string, data string) {
reader, blocklen, _, err := keepClient.Get(locator)
if err != nil {
t.Fatalf("Error getting test data in setup for %s %s %v", data, locator, err)
}
// Create a collection using arv-put
-func CreateCollection(t *testing.T, data string) string {
+func createCollection(t *testing.T, data string) string {
tempfile, err := ioutil.TempFile(os.TempDir(), "temp-test-file")
defer os.Remove(tempfile.Name())
return uuid
}
-// Get collection using arv-get
+// Get collection locator
var locatorMatcher = regexp.MustCompile(`^([0-9a-f]{32})\+(\d*)(.*)$`)
-func GetCollection(t *testing.T, uuid string) string {
- output, err := exec.Command("arv-get", uuid).Output()
- if err != nil {
- t.Fatalf("Error during arv-get %s", err)
- }
+func getCollectionLocator(t *testing.T, uuid string) string {
+ manifest := getCollection(t, uuid)["manifest_text"].(string)
- locator := strings.Split(string(output), " ")[1]
+ locator := strings.Split(manifest, " ")[1]
match := locatorMatcher.FindStringSubmatch(locator)
if match == nil {
- t.Fatalf("No locator found in collection manifest %s", string(output))
+ t.Fatalf("No locator found in collection manifest %s", manifest)
}
return match[1] + "+" + match[2]
}
+func getCollection(t *testing.T, uuid string) Dict {
+ getback := make(Dict)
+ err := arv.Get("collections", uuid, nil, &getback)
+ if err != nil {
+ t.Fatalf("Error getting collection %s", err)
+ }
+ if getback["uuid"] != uuid {
+ t.Fatalf("Get collection uuid did not match original: $s, result: $s", uuid, getback["uuid"])
+ }
+
+ return getback
+}
+
+func updateCollection(t *testing.T, uuid string, paramName string, paramValue string) {
+ err := arv.Update("collections", uuid, arvadosclient.Dict{
+ "collection": arvadosclient.Dict{
+ paramName: paramValue,
+ },
+ }, &arvadosclient.Dict{})
+
+ if err != nil {
+ t.Fatalf("Error updating collection %s", err)
+ }
+}
+
type Dict map[string]interface{}
-func DeleteCollection(t *testing.T, uuid string) {
+func deleteCollection(t *testing.T, uuid string) {
getback := make(Dict)
err := arv.Delete("collections", uuid, nil, &getback)
if err != nil {
}
}
-func DataManagerSingleRun(t *testing.T) {
+func dataManagerSingleRun(t *testing.T) {
err := singlerun()
if err != nil {
t.Fatalf("Error during singlerun %s", err)
}
}
-func GetBlockIndexes(t *testing.T) []string {
+func getBlockIndexesForServer(t *testing.T, i int) []string {
var indexes []string
- for i := 0; i < len(keepServers); i++ {
- path := keepServers[i] + "/index"
- client := http.Client{}
- req, err := http.NewRequest("GET", path, nil)
- req.Header.Add("Authorization", "OAuth2 "+keep.GetDataManagerToken(nil))
- req.Header.Add("Content-Type", "application/octet-stream")
- resp, err := client.Do(req)
- defer resp.Body.Close()
+ path := keepServers[i] + "/index"
+ client := http.Client{}
+ req, err := http.NewRequest("GET", path, nil)
+ req.Header.Add("Authorization", "OAuth2 "+keep.GetDataManagerToken(nil))
+ req.Header.Add("Content-Type", "application/octet-stream")
+ resp, err := client.Do(req)
+ defer resp.Body.Close()
- if err != nil {
- t.Fatalf("Error during %s %s", path, err)
- }
+ if err != nil {
+ t.Fatalf("Error during %s %s", path, err)
+ }
- body, err := ioutil.ReadAll(resp.Body)
- if err != nil {
- t.Fatalf("Error reading response from %s %s", path, err)
- }
+ body, err := ioutil.ReadAll(resp.Body)
+ if err != nil {
+ t.Fatalf("Error reading response from %s %s", path, err)
+ }
- lines := strings.Split(string(body), "\n")
- for _, line := range lines {
- indexes = append(indexes, strings.Split(line, " ")...)
- }
+ lines := strings.Split(string(body), "\n")
+ for _, line := range lines {
+ indexes = append(indexes, strings.Split(line, " ")...)
}
return indexes
}
-func VerifyBlocks(t *testing.T, not_expected []string, expected []string) {
- blocks := GetBlockIndexes(t)
- for _, block := range not_expected {
- exists := ValueInArray(block, blocks)
- if exists {
- t.Fatalf("Found unexpected block in index %s", block)
+func getBlockIndexes(t *testing.T) [][]string {
+ var indexes [][]string
+
+ for i := 0; i < len(keepServers); i++ {
+ indexes = append(indexes, getBlockIndexesForServer(t, i))
+ }
+ return indexes
+}
+
+func verifyBlocks(t *testing.T, notExpected []string, expected []string) {
+ blocks := getBlockIndexes(t)
+ for _, block := range notExpected {
+ for i := 0; i < len(blocks); i++ {
+ exists := valueInArray(block, blocks[i])
+ if exists {
+ t.Fatalf("Found unexpected block in index %s", block)
+ }
+ }
+ }
+
+ // var blockExists [][]string
+ blockExists := make(map[string][]string)
+ for _, block := range expected {
+ var blockArray []string
+ for i := 0; i < len(blocks); i++ {
+ exists := valueInArray(block, blocks[i])
+ if exists {
+ blockArray = append(blockArray, block)
+ }
}
+ blockExists[block] = blockArray
}
+
for _, block := range expected {
- exists := ValueInArray(block, blocks)
- if !exists {
- t.Fatalf("Did not find expected block in index %s", block)
+ if blockExists[block] == nil || len(blockExists[block]) != 2 {
+ t.Fatalf("Expected to find two replicas for block %s; found %d", block, len(blockExists[block]))
}
}
}
-func ValueInArray(value string, list []string) bool {
+func valueInArray(value string, list []string) bool {
for _, v := range list {
if value == v {
return true
The keep volumes are of the dir structure:
volumeN/subdir/locator
*/
-func BackdateBlocks(t *testing.T, oldBlockLocators []string) {
+func backdateBlocks(t *testing.T, oldUnusedBlockLocators []string) {
// First get rid of any size hints in the locators
var trimmedBlockLocators []string
- for _, block := range oldBlockLocators {
+ for _, block := range oldUnusedBlockLocators {
trimmedBlockLocators = append(trimmedBlockLocators, strings.Split(block, "+")[0])
}
}
// Now cycle through the two keep volumes
- oldTime := time.Now().AddDate(0, -1, 0)
+ oldTime := time.Now().AddDate(0, -2, 0)
for i := 0; i < 2; i++ {
filename := fmt.Sprintf("%s/../../tmp/keep%d.volume", wd, i)
volumeDir, err := ioutil.ReadFile(filename)
for _, fileInfo := range subdirContents {
blockName := fileInfo.Name()
myname := fmt.Sprintf("%s/%s", subdirName, blockName)
- if ValueInArray(blockName, trimmedBlockLocators) {
+ if valueInArray(blockName, trimmedBlockLocators) {
err = os.Chtimes(myname, oldTime, oldTime)
}
}
}
}
-func GetStatus(t *testing.T, path string) interface{} {
+func getStatus(t *testing.T, path string) interface{} {
client := http.Client{}
req, err := http.NewRequest("GET", path, nil)
req.Header.Add("Authorization", "OAuth2 "+keep.GetDataManagerToken(nil))
return s
}
+func waitUntilQueuesFinishWork(t *testing.T) {
+ // Wait until PullQueue and TrashQueue finish their work
+ for {
+ var done [2]bool
+ for i := 0; i < 2; i++ {
+ s := getStatus(t, keepServers[i]+"/status.json")
+ var pullQueueStatus interface{}
+ pullQueueStatus = s.(map[string]interface{})["PullQueue"]
+ var trashQueueStatus interface{}
+ trashQueueStatus = s.(map[string]interface{})["TrashQueue"]
+
+ if pullQueueStatus.(map[string]interface{})["Queued"] == float64(0) &&
+ pullQueueStatus.(map[string]interface{})["InProgress"] == float64(0) &&
+ trashQueueStatus.(map[string]interface{})["Queued"] == float64(0) &&
+ trashQueueStatus.(map[string]interface{})["InProgress"] == float64(0) {
+ done[i] = true
+ }
+ }
+ if done[0] && done[1] {
+ break
+ } else {
+ time.Sleep(100 * time.Millisecond)
+ }
+ }
+}
+
+/*
+Create some blocks and backdate some of them.
+Also create some collections and delete some of them.
+Verify block indexes.
+*/
func TestPutAndGetBlocks(t *testing.T) {
log.Print("TestPutAndGetBlocks start")
defer TearDownDataManagerTest(t)
SetupDataManagerTest(t)
- // Put some blocks and change their mtime to before ttl
- var oldBlockLocators []string
- oldBlockData := "this block will have older mtime"
- for i := 0; i < 2; i++ {
- oldBlockLocators = append(oldBlockLocators, PutBlock(t, oldBlockData+string(i)))
+ // Put some blocks which will be backdated later on
+ // The first one will also be used in a collection and hence should not be deleted when datamanager runs.
+ // The rest will be old and unreferenced and hence should be deleted when datamanager runs.
+ var oldUnusedBlockLocators []string
+ oldUnusedBlockData := "this block will have older mtime"
+ for i := 0; i < 5; i++ {
+ oldUnusedBlockLocators = append(oldUnusedBlockLocators, putBlock(t, fmt.Sprintf("%s%d", oldUnusedBlockData, i)))
}
- for i := 0; i < 2; i++ {
- GetBlock(t, oldBlockLocators[i], oldBlockData+string(i))
+ for i := 0; i < 5; i++ {
+ getBlock(t, oldUnusedBlockLocators[i], fmt.Sprintf("%s%d", oldUnusedBlockData, i))
}
- // Put some more blocks whose mtime won't be changed
+ // The rest will be old and unreferenced and hence should be deleted when datamanager runs.
+ oldUsedBlockData := "this collection block will have older mtime"
+ oldUsedBlockLocator := putBlock(t, oldUsedBlockData)
+ getBlock(t, oldUsedBlockLocator, oldUsedBlockData)
+
+ // Put some more blocks which will not be backdated; hence they are still new, but not in any collection.
+ // Hence, even though unreferenced, these should not be deleted when datamanager runs.
var newBlockLocators []string
newBlockData := "this block is newer"
- for i := 0; i < 1; i++ {
- newBlockLocators = append(newBlockLocators, PutBlock(t, newBlockData+string(i)))
+ for i := 0; i < 5; i++ {
+ newBlockLocators = append(newBlockLocators, putBlock(t, fmt.Sprintf("%s%d", newBlockData, i)))
}
- for i := 0; i < 1; i++ {
- GetBlock(t, newBlockLocators[i], newBlockData+string(i))
+ for i := 0; i < 5; i++ {
+ getBlock(t, newBlockLocators[i], fmt.Sprintf("%s%d", newBlockData, i))
}
- // Create a collection that would be deleted
- to_delete_collection_uuid := CreateCollection(t, "some data for collection creation")
- to_delete_collection_locator := GetCollection(t, to_delete_collection_uuid)
+ // Create a collection that would be deleted later on
+ toBeDeletedCollectionUuid := createCollection(t, "some data for collection creation")
+ toBeDeletedCollectionLocator := getCollectionLocator(t, toBeDeletedCollectionUuid)
// Create another collection that has the same data as the one of the old blocks
- old_block_collection_uuid := CreateCollection(t, "this block will have older mtime0")
- old_block_collection_locator := GetCollection(t, old_block_collection_uuid)
- exists := ValueInArray(strings.Split(old_block_collection_locator, "+")[0], oldBlockLocators)
- if exists {
- t.Fatalf("Locator of the collection with the same data as old block is different %s", old_block_collection_locator)
+ oldUsedBlockCollectionUuid := createCollection(t, oldUsedBlockData)
+ oldUsedBlockCollectionLocator := getCollectionLocator(t, oldUsedBlockCollectionUuid)
+ if oldUsedBlockCollectionLocator != oldUsedBlockLocator {
+ t.Fatalf("Locator of the collection with the same data as old block is different %s", oldUsedBlockCollectionLocator)
}
- // Invoking datamanager singlerun or /index several times is resulting in errors
- // Hence, for now just invoke once at the end of test
+ // Create another collection whose replication level will be changed
+ replicationCollectionUuid := createCollection(t, "replication level on this collection will be reduced")
+ replicationCollectionLocator := getCollectionLocator(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)
+ secondOfTwoWithSameDataUuid := createCollection(t, dataForTwoCollections)
+ secondOfTwoWithSameDataLocator := getCollectionLocator(t, secondOfTwoWithSameDataUuid)
+ if oneOfTwoWithSameDataLocator != secondOfTwoWithSameDataLocator {
+ t.Fatalf("Locators for both these collections expected to be same: %s %s", oneOfTwoWithSameDataLocator, secondOfTwoWithSameDataLocator)
+ }
+ // Verify blocks before doing any backdating / deleting.
var expected []string
- expected = append(expected, oldBlockLocators...)
+ expected = append(expected, oldUnusedBlockLocators...)
expected = append(expected, newBlockLocators...)
- expected = append(expected, to_delete_collection_locator)
+ expected = append(expected, toBeDeletedCollectionLocator)
+ expected = append(expected, replicationCollectionLocator)
+ expected = append(expected, oneOfTwoWithSameDataLocator)
+ expected = append(expected, secondOfTwoWithSameDataLocator)
- VerifyBlocks(t, nil, expected)
+ verifyBlocks(t, nil, expected)
// Run datamanager in singlerun mode
- DataManagerSingleRun(t)
+ dataManagerSingleRun(t)
+ waitUntilQueuesFinishWork(t)
- // Change mtime on old blocks and delete the collection
- DeleteCollection(t, to_delete_collection_uuid)
- BackdateBlocks(t, oldBlockLocators)
+ verifyBlocks(t, nil, expected)
- // Run data manager
- time.Sleep(1 * time.Second)
- DataManagerSingleRun(t)
+ // Backdate the to-be old blocks and delete the collections
+ backdateBlocks(t, oldUnusedBlockLocators)
+ deleteCollection(t, toBeDeletedCollectionUuid)
+ deleteCollection(t, secondOfTwoWithSameDataUuid)
- // Wait until PullQueue and TrashQueue finish their work
- for {
- var done [2]bool
- for i := 0; i < 2; i++ {
- s := GetStatus(t, keepServers[i]+"/status.json")
- var pullQueueStatus interface{}
- pullQueueStatus = s.(map[string]interface{})["PullQueue"]
- var trashQueueStatus interface{}
- trashQueueStatus = s.(map[string]interface{})["TrashQueue"]
- if pullQueueStatus.(map[string]interface{})["Queued"] == float64(0) &&
- pullQueueStatus.(map[string]interface{})["InProgress"] == float64(0) &&
- trashQueueStatus.(map[string]interface{})["Queued"] == float64(0) &&
- trashQueueStatus.(map[string]interface{})["InProgress"] == float64(0) {
- done[i] = true
- }
+ // Run data manager again
+ dataManagerSingleRun(t)
+ waitUntilQueuesFinishWork(t)
+
+ // Get block indexes and verify that all backdated blocks except the first one used in collection are not included.
+ expected = expected[:0]
+ expected = append(expected, oldUsedBlockLocator)
+ expected = append(expected, newBlockLocators...)
+ expected = append(expected, toBeDeletedCollectionLocator)
+ expected = append(expected, replicationCollectionLocator)
+ expected = append(expected, oneOfTwoWithSameDataLocator)
+ expected = append(expected, secondOfTwoWithSameDataLocator)
+
+ verifyBlocks(t, oldUnusedBlockLocators, expected)
+
+ // Reduce replication on replicationCollectionUuid collection and verify that the overreplicated blocks are untouched.
+
+ // Default replication level is 2; first verify that the replicationCollectionLocator appears in both volumes
+ for i := 0; i < len(keepServers); i++ {
+ indexes := getBlockIndexesForServer(t, i)
+ if !valueInArray(replicationCollectionLocator, indexes) {
+ t.Fatalf("Not found block in index %s", replicationCollectionLocator)
}
- if done[0] && done[1] {
- break
- } else {
- time.Sleep(1 * time.Second)
+ }
+
+ // Now reduce replication level on this collection and verify that it still appears in both volumes
+ updateCollection(t, replicationCollectionUuid, "replication_desired", "1")
+ collection := getCollection(t, replicationCollectionUuid)
+ if collection["replication_desired"].(interface{}) != float64(1) {
+ t.Fatalf("After update replication_desired is not 1; instead it is %v", collection["replication_desired"])
+ }
+
+ // Run data manager again
+ time.Sleep(100 * time.Millisecond)
+ dataManagerSingleRun(t)
+ waitUntilQueuesFinishWork(t)
+
+ for i := 0; i < len(keepServers); i++ {
+ indexes := getBlockIndexesForServer(t, i)
+ if !valueInArray(replicationCollectionLocator, indexes) {
+ t.Fatalf("Not found block in index %s", replicationCollectionLocator)
}
}
+ // Done testing reduce replication on collection
- // Get block indexes and verify that the deleted collection block is no longer found
- var not_expected []string
- not_expected = append(not_expected, oldBlockLocators...)
- not_expected = append(not_expected, to_delete_collection_locator)
- VerifyBlocks(t, not_expected, newBlockLocators)
+ // Verify blocks one more time
+ verifyBlocks(t, oldUnusedBlockLocators, expected)
}
-// Invoking datamanager singlerun several times resulting in errors.
-// Until that issue is resolved, don't run this test in the meantime.
-func TestDatamanagerSingleRunRepeatedly(t *testing.T) {
+func _TestDatamanagerSingleRunRepeatedly(t *testing.T) {
log.Print("TestDatamanagerSingleRunRepeatedly start")
defer TearDownDataManagerTest(t)
if err != nil {
t.Fatalf("Got an error during datamanager singlerun: %v", err)
}
- time.Sleep(1 * time.Second)
+ time.Sleep(100 * time.Millisecond)
}
}
-func TestGetStatusRepeatedly(t *testing.T) {
+func _TestGetStatusRepeatedly(t *testing.T) {
log.Print("TestGetStatusRepeatedly start")
defer TearDownDataManagerTest(t)
for i := 0; i < 10; i++ {
for j := 0; j < 2; j++ {
- s := GetStatus(t, keepServers[j]+"/status.json")
+ s := getStatus(t, keepServers[j]+"/status.json")
var pullQueueStatus interface{}
pullQueueStatus = s.(map[string]interface{})["PullQueue"]
t.Fatalf("PullQueue and TrashQueue status not found")
}
- time.Sleep(1 * time.Second)
+ time.Sleep(100 * time.Millisecond)
}
}
}
projects / arvados.git / blobdiff