projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11168: Prohibit down-migration to YAML-only codebase.
[arvados.git]
/
services
/
keepstore
/
volume_test.go
diff --git
a/services/keepstore/volume_test.go
b/services/keepstore/volume_test.go
index 508c7fa24f4b7a385220ff1ef55e4a166ff2d9f8..931c10e69044c4715eb35ccab4d33872a848db5d 100644
(file)
--- a/
services/keepstore/volume_test.go
+++ b/
services/keepstore/volume_test.go
@@
-2,6
+2,7
@@
package main
import (
"bytes"
import (
"bytes"
+ "context"
"crypto/md5"
"errors"
"fmt"
"crypto/md5"
"errors"
"fmt"
@@
-95,7
+96,7
@@
func (v *MockVolume) gotCall(method string) {
}
}
}
}
-func (v *MockVolume) Compare(loc string, buf []byte) error {
+func (v *MockVolume) Compare(
ctx context.Context,
loc string, buf []byte) error {
v.gotCall("Compare")
<-v.Gate
if v.Bad {
v.gotCall("Compare")
<-v.Gate
if v.Bad {
@@
-113,20
+114,19
@@
func (v *MockVolume) Compare(loc string, buf []byte) error {
}
}
}
}
-func (v *MockVolume) Get(
loc string) ([]byte
, error) {
+func (v *MockVolume) Get(
ctx context.Context, loc string, buf []byte) (int
, error) {
v.gotCall("Get")
<-v.Gate
if v.Bad {
v.gotCall("Get")
<-v.Gate
if v.Bad {
- return
nil
, errors.New("Bad volume")
+ return
0
, errors.New("Bad volume")
} else if block, ok := v.Store[loc]; ok {
} else if block, ok := v.Store[loc]; ok {
- buf := bufs.Get(len(block))
- copy(buf, block)
- return buf, nil
+ copy(buf[:len(block)], block)
+ return len(block), nil
}
}
- return
nil
, os.ErrNotExist
+ return
0
, os.ErrNotExist
}
}
-func (v *MockVolume) Put(loc string, block []byte) error {
+func (v *MockVolume) Put(
ctx context.Context,
loc string, block []byte) error {
v.gotCall("Put")
<-v.Gate
if v.Bad {
v.gotCall("Put")
<-v.Gate
if v.Bad {
@@
-190,7
+190,7
@@
func (v *MockVolume) Trash(loc string) error {
return MethodDisabledError
}
if _, ok := v.Store[loc]; ok {
return MethodDisabledError
}
if _, ok := v.Store[loc]; ok {
- if time.Since(v.Timestamps[loc]) <
blobSignatureTTL
{
+ if time.Since(v.Timestamps[loc]) <
time.Duration(theConfig.BlobSignatureTTL)
{
return nil
}
delete(v.Store, loc)
return nil
}
delete(v.Store, loc)
@@
-199,7
+199,14
@@
func (v *MockVolume) Trash(loc string) error {
return os.ErrNotExist
}
return os.ErrNotExist
}
-// TBD
+func (v *MockVolume) Type() string {
+ return "Mock"
+}
+
+func (v *MockVolume) Start() error {
+ return nil
+}
+
func (v *MockVolume) Untrash(loc string) error {
return nil
}
func (v *MockVolume) Untrash(loc string) error {
return nil
}
@@
-224,6
+231,5
@@
func (v *MockVolume) Replication() int {
return 1
}
return 1
}
-func (v *MockVolume) EmptyTrash() error {
- return nil
+func (v *MockVolume) EmptyTrash() {
}
}