fyrchik/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

Hello, I am a robot. #1

Closed
fyrchik wants to merge 70 commits from test-2144074865 into master
pull from: test-2144074865
merge into: fyrchik:master
Conversation 0 Commits 70 Files changed 901 +6 -5
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 34329d67ff - Show all commits

2
pkg/local_object_storage/internal/testutil/generators.go
View file

@ -59,7 +59,7 @@ var _ ObjectGenerator = &SeqObjGenerator{}
func generateObjectWithOIDWithCIDWithSize(oid oid.ID, cid cid.ID, sz uint64) *object.Object { func generateObjectWithOIDWithCIDWithSize(oid oid.ID, cid cid.ID, sz uint64) *object.Object {
data := make([]byte, sz) data := make([]byte, sz)
rand.Read(data) _, _ = rand.Read(data)
obj := GenerateObjectWithCIDWithPayload(cid, data) obj := GenerateObjectWithCIDWithPayload(cid, data)
obj.SetID(oid) obj.SetID(oid)
return obj return obj

2
pkg/local_object_storage/internal/testutil/object.go
View file

@ -22,7 +22,7 @@ func GenerateObject() *object.Object {
func GenerateObjectWithCID(cnr cid.ID) *object.Object { func GenerateObjectWithCID(cnr cid.ID) *object.Object {
data := make([]byte, defaultDataSize) data := make([]byte, defaultDataSize)
rand.Read(data) _, _ = rand.Read(data)
return GenerateObjectWithCIDWithPayload(cnr, data) return GenerateObjectWithCIDWithPayload(cnr, data)
} }

2
pkg/local_object_storage/shard/dump_test.go
View file

@ -327,7 +327,7 @@ func TestDumpIgnoreErrors(t *testing.T) {
objects := make([]*objectSDK.Object, objCount) objects := make([]*objectSDK.Object, objCount)
for i := 0; i < objCount; i++ { for i := 0; i < objCount; i++ {
size := (wcSmallObjectSize << (i % 4)) - headerSize size := (wcSmallObjectSize << (i % 4)) - headerSize
obj := testutil.GenerateObjectWithPayload(cidtest.ID(), make([]byte, size)) obj := testutil.GenerateObjectWithCIDWithPayload(cidtest.ID(), make([]byte, size))
objects[i] = obj objects[i] = obj
var prm shard.PutPrm var prm shard.PutPrm

5
pkg/local_object_storage/shard/gc_test.go
View file

@ -11,6 +11,7 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util"
@ -83,7 +84,7 @@ func Test_GCDropsLockedExpiredObject(t *testing.T) {
objExpirationAttr.SetKey(objectV2.SysAttributeExpEpoch) objExpirationAttr.SetKey(objectV2.SysAttributeExpEpoch)
objExpirationAttr.SetValue("101") objExpirationAttr.SetValue("101")
obj := generateObjectWithCID(t, cnr) obj := testutil.GenerateObjectWithCID(cnr)
obj.SetAttributes(objExpirationAttr) obj.SetAttributes(objExpirationAttr)
objID, _ := obj.ID() objID, _ := obj.ID()
@ -91,7 +92,7 @@ func Test_GCDropsLockedExpiredObject(t *testing.T) {
lockExpirationAttr.SetKey(objectV2.SysAttributeExpEpoch) lockExpirationAttr.SetKey(objectV2.SysAttributeExpEpoch)
lockExpirationAttr.SetValue("103") lockExpirationAttr.SetValue("103")
lock := generateObjectWithCID(t, cnr) lock := testutil.GenerateObjectWithCID(cnr)
lock.SetType(object.TypeLock) lock.SetType(object.TypeLock)
lock.SetAttributes(lockExpirationAttr) lock.SetAttributes(lockExpirationAttr)
lockID, _ := lock.ID() lockID, _ := lock.ID()