X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0e5198142fdba0ce2af6eb2852d45dff46ffb2e2..b117de413113ab28e2f2e5a2ebd73830fcef96dc:/services/keepstore/keepstore_test.go diff --git a/services/keepstore/keepstore_test.go b/services/keepstore/keepstore_test.go index dc6af0fa0d..26d49946a4 100644 --- a/services/keepstore/keepstore_test.go +++ b/services/keepstore/keepstore_test.go @@ -1,7 +1,12 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + package main import ( "bytes" + "context" "fmt" "io/ioutil" "os" @@ -61,13 +66,13 @@ func TestGetBlock(t *testing.T) { defer KeepVM.Close() vols := KeepVM.AllReadable() - if err := vols[1].Put(TestHash, TestBlock); err != nil { + if err := vols[1].Put(context.Background(), TestHash, TestBlock); err != nil { t.Error(err) } // Check that GetBlock returns success. buf := make([]byte, BlockSize) - size, err := GetBlock(TestHash, buf, nil) + size, err := GetBlock(context.Background(), TestHash, buf, nil) if err != nil { t.Errorf("GetBlock error: %s", err) } @@ -88,7 +93,7 @@ func TestGetBlockMissing(t *testing.T) { // Check that GetBlock returns failure. buf := make([]byte, BlockSize) - size, err := GetBlock(TestHash, buf, nil) + size, err := GetBlock(context.Background(), TestHash, buf, nil) if err != NotFoundError { t.Errorf("Expected NotFoundError, got %v, err %v", buf[:size], err) } @@ -106,11 +111,11 @@ func TestGetBlockCorrupt(t *testing.T) { defer KeepVM.Close() vols := KeepVM.AllReadable() - vols[0].Put(TestHash, BadBlock) + vols[0].Put(context.Background(), TestHash, BadBlock) // Check that GetBlock returns failure. buf := make([]byte, BlockSize) - size, err := GetBlock(TestHash, buf, nil) + size, err := GetBlock(context.Background(), TestHash, buf, nil) if err != DiskHashError { t.Errorf("Expected DiskHashError, got %v (buf: %v)", err, buf[:size]) } @@ -131,13 +136,13 @@ func TestPutBlockOK(t *testing.T) { defer KeepVM.Close() // Check that PutBlock stores the data as expected. - if n, err := PutBlock(TestBlock, TestHash); err != nil || n < 1 { + if n, err := PutBlock(context.Background(), TestBlock, TestHash); err != nil || n < 1 { t.Fatalf("PutBlock: n %d err %v", n, err) } vols := KeepVM.AllReadable() buf := make([]byte, BlockSize) - n, err := vols[1].Get(TestHash, buf) + n, err := vols[1].Get(context.Background(), TestHash, buf) if err != nil { t.Fatalf("Volume #0 Get returned error: %v", err) } @@ -162,12 +167,12 @@ func TestPutBlockOneVol(t *testing.T) { vols[0].(*MockVolume).Bad = true // Check that PutBlock stores the data as expected. - if n, err := PutBlock(TestBlock, TestHash); err != nil || n < 1 { + if n, err := PutBlock(context.Background(), TestBlock, TestHash); err != nil || n < 1 { t.Fatalf("PutBlock: n %d err %v", n, err) } buf := make([]byte, BlockSize) - size, err := GetBlock(TestHash, buf, nil) + size, err := GetBlock(context.Background(), TestHash, buf, nil) if err != nil { t.Fatalf("GetBlock: %v", err) } @@ -190,12 +195,12 @@ func TestPutBlockMD5Fail(t *testing.T) { // Check that PutBlock returns the expected error when the hash does // not match the block. - if _, err := PutBlock(BadBlock, TestHash); err != RequestHashError { + if _, err := PutBlock(context.Background(), BadBlock, TestHash); err != RequestHashError { t.Errorf("Expected RequestHashError, got %v", err) } // Confirm that GetBlock fails to return anything. - if result, err := GetBlock(TestHash, make([]byte, BlockSize), nil); err != NotFoundError { + if result, err := GetBlock(context.Background(), TestHash, make([]byte, BlockSize), nil); err != NotFoundError { t.Errorf("GetBlock succeeded after a corrupt block store (result = %s, err = %v)", string(result), err) } @@ -214,14 +219,14 @@ func TestPutBlockCorrupt(t *testing.T) { // Store a corrupted block under TestHash. vols := KeepVM.AllWritable() - vols[0].Put(TestHash, BadBlock) - if n, err := PutBlock(TestBlock, TestHash); err != nil || n < 1 { + vols[0].Put(context.Background(), TestHash, BadBlock) + if n, err := PutBlock(context.Background(), TestBlock, TestHash); err != nil || n < 1 { t.Errorf("PutBlock: n %d err %v", n, err) } // The block on disk should now match TestBlock. buf := make([]byte, BlockSize) - if size, err := GetBlock(TestHash, buf, nil); err != nil { + if size, err := GetBlock(context.Background(), TestHash, buf, nil); err != nil { t.Errorf("GetBlock: %v", err) } else if bytes.Compare(buf[:size], TestBlock) != 0 { t.Errorf("Got %+q, expected %+q", buf[:size], TestBlock) @@ -246,10 +251,10 @@ func TestPutBlockCollision(t *testing.T) { // Store one block, then attempt to store the other. Confirm that // PutBlock reported a CollisionError. - if _, err := PutBlock(b1, locator); err != nil { + if _, err := PutBlock(context.Background(), b1, locator); err != nil { t.Error(err) } - if _, err := PutBlock(b2, locator); err == nil { + if _, err := PutBlock(context.Background(), b2, locator); err == nil { t.Error("PutBlock did not report a collision") } else if err != CollisionError { t.Errorf("PutBlock returned %v", err) @@ -271,7 +276,7 @@ func TestPutBlockTouchFails(t *testing.T) { // Store a block and then make the underlying volume bad, // so a subsequent attempt to update the file timestamp // will fail. - vols[0].Put(TestHash, BadBlock) + vols[0].Put(context.Background(), TestHash, BadBlock) oldMtime, err := vols[0].Mtime(TestHash) if err != nil { t.Fatalf("vols[0].Mtime(%s): %s\n", TestHash, err) @@ -280,7 +285,7 @@ func TestPutBlockTouchFails(t *testing.T) { // vols[0].Touch will fail on the next call, so the volume // manager will store a copy on vols[1] instead. vols[0].(*MockVolume).Touchable = false - if n, err := PutBlock(TestBlock, TestHash); err != nil || n < 1 { + if n, err := PutBlock(context.Background(), TestBlock, TestHash); err != nil || n < 1 { t.Fatalf("PutBlock: n %d err %v", n, err) } vols[0].(*MockVolume).Touchable = true @@ -296,7 +301,7 @@ func TestPutBlockTouchFails(t *testing.T) { oldMtime, newMtime) } buf := make([]byte, BlockSize) - n, err := vols[1].Get(TestHash, buf) + n, err := vols[1].Get(context.Background(), TestHash, buf) if err != nil { t.Fatalf("vols[1]: %v", err) } @@ -400,11 +405,11 @@ func TestIndex(t *testing.T) { defer KeepVM.Close() vols := KeepVM.AllReadable() - vols[0].Put(TestHash, TestBlock) - vols[1].Put(TestHash2, TestBlock2) - vols[0].Put(TestHash3, TestBlock3) - vols[0].Put(TestHash+".meta", []byte("metadata")) - vols[1].Put(TestHash2+".meta", []byte("metadata")) + vols[0].Put(context.Background(), TestHash, TestBlock) + vols[1].Put(context.Background(), TestHash2, TestBlock2) + vols[0].Put(context.Background(), TestHash3, TestBlock3) + vols[0].Put(context.Background(), TestHash+".meta", []byte("metadata")) + vols[1].Put(context.Background(), TestHash2+".meta", []byte("metadata")) buf := new(bytes.Buffer) vols[0].IndexTo("", buf)