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

[#1016] frostfs-node: Fix gopls issues

Browse source 
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2024-03-01 11:58:17 +03:00
parent 6dbb61caf4
commit d6534fd755
16 changed files with 53 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/frostfs-adm/internal/modules/morph/initialize/initialize_test.go
View file

@ -53,7 +53,7 @@ func TestInitialize(t *testing.T) {
testInitialize(t, constants.MaxAlphabetNodes)
})
t.Run("too many nodes", func(t *testing.T) {
require.ErrorIs(t, generateTestData(t, t.TempDir(), constants.MaxAlphabetNodes+1), helper.ErrTooManyAlphabetNodes)
require.ErrorIs(t, generateTestData(t.TempDir(), constants.MaxAlphabetNodes+1), helper.ErrTooManyAlphabetNodes)
})
}
@ -61,7 +61,7 @@ func testInitialize(t *testing.T, committeeSize int) {
testdataDir := t.TempDir()
v := viper.GetViper()
require.NoError(t, generateTestData(t, testdataDir, committeeSize))
require.NoError(t, generateTestData(testdataDir, committeeSize))
v.Set(constants.ProtoConfigPath, filepath.Join(testdataDir, protoFileName))
// Set to the path or remove the next statement to download from the network.
@ -98,7 +98,7 @@ func testInitialize(t *testing.T, committeeSize int) {
})
}
func generateTestData(t *testing.T, dir string, size int) error {
func generateTestData(dir string, size int) error {
v := viper.GetViper()
v.Set(commonflags.AlphabetWalletsFlag, dir)

2
cmd/frostfs-node/cache_test.go
View file

@ -10,7 +10,7 @@ import (
func TestTTLNetCache(t *testing.T) {
ttlDuration := time.Millisecond * 50
cache := newNetworkTTLCache[string, time.Time](10, ttlDuration, testNetValueReader)
cache := newNetworkTTLCache(10, ttlDuration, testNetValueReader)
key := "key"

10
cmd/frostfs-node/config/morph/config_test.go
View file

@ -24,8 +24,14 @@ func TestMorphSection(t *testing.T) {
const path = "../../../../config/example/node"
rpcs := []client.Endpoint{
{"wss://rpc1.morph.frostfs.info:40341/ws", 1},
{"wss://rpc2.morph.frostfs.info:40341/ws", 2},
{
Address: "wss://rpc1.morph.frostfs.info:40341/ws",
Priority: 1,
},
{
Address: "wss://rpc2.morph.frostfs.info:40341/ws",
Priority: 2,
},
}
fileConfigTest := func(c *config.Config) {

22
internal/ape/converter_test.go
View file

@ -27,7 +27,7 @@ func TestEACLTableWithoutRecords(t *testing.T) {
res: &testResource{name: nativeschema.ResourceFormatRootObjects},
}
compare(t, tb, vu, ch, req)
compare(t, vu, ch, req)
cnrID := cidtest.ID()
tb.SetCID(cnrID)
@ -37,7 +37,7 @@ func TestEACLTableWithoutRecords(t *testing.T) {
ch, err = ConvertEACLToAPE(tb)
require.NoError(t, err)
compare(t, tb, vu, ch, req)
compare(t, vu, ch, req)
}
func TestNoTargets(t *testing.T) {
@ -69,7 +69,7 @@ func TestNoTargets(t *testing.T) {
},
res: &testResource{name: fmt.Sprintf(nativeschema.ResourceFormatRootContainerObjects, cnrID.EncodeToString())},
}
compare(t, tb, vu, ch, req)
compare(t, vu, ch, req)
}
}
@ -109,7 +109,7 @@ func TestNoFilters(t *testing.T) {
},
res: &testResource{name: fmt.Sprintf(nativeschema.ResourceFormatRootContainerObjects, cnrID.EncodeToString())},
}
compare(t, tb, vu, ch, req)
compare(t, vu, ch, req)
}
})
@ -155,7 +155,7 @@ func TestNoFilters(t *testing.T) {
},
res: &testResource{name: fmt.Sprintf(nativeschema.ResourceFormatRootContainerObjects, cnrID.EncodeToString())},
}
compare(t, tb, vu, ch, req)
compare(t, vu, ch, req)
}
})
@ -199,7 +199,7 @@ func TestNoFilters(t *testing.T) {
},
res: &testResource{name: fmt.Sprintf(nativeschema.ResourceFormatRootContainerObjects, cnrID.EncodeToString())},
}
compare(t, tb, vu, ch, req)
compare(t, vu, ch, req)
}
})
@ -236,7 +236,7 @@ func TestNoFilters(t *testing.T) {
},
res: &testResource{name: fmt.Sprintf(nativeschema.ResourceFormatRootContainerObjects, cnrID.EncodeToString())},
}
compare(t, tb, vu, ch, req)
compare(t, vu, ch, req)
}
})
}
@ -292,7 +292,7 @@ func TestWithFilters(t *testing.T) {
},
},
}
compare(t, tb, vu, ch, req)
compare(t, vu, ch, req)
}
})
@ -342,7 +342,7 @@ func TestWithFilters(t *testing.T) {
name: fmt.Sprintf(nativeschema.ResourceFormatRootContainerObjects, cnrID.EncodeToString()),
},
}
compare(t, tb, vu, ch, req)
compare(t, vu, ch, req)
}
})
}
@ -391,10 +391,10 @@ func TestNoHeader(t *testing.T) {
name: fmt.Sprintf(nativeschema.ResourceFormatRootContainerObjects, cnrID.EncodeToString()),
},
}
compare(t, tb, vu, ch, req)
compare(t, vu, ch, req)
}
func compare(t *testing.T, eaclTable *eacl.Table, vu *eacl.ValidationUnit, ch *apechain.Chain, req *testRequest) {
func compare(t *testing.T, vu *eacl.ValidationUnit, ch *apechain.Chain, req *testRequest) {
validator := eacl.NewValidator()
for eaclOp, apeOp := range eaclOperationToEngineAction {
vu.WithOperation(eaclOp)

5
pkg/innerring/initialization.go
View file

@ -42,10 +42,6 @@ func (s *Server) initNetmapProcessor(cfg *viper.Viper,
return err
}
if err != nil {
return err
}
netSettings := (*networkSettings)(s.netmapClient)
var netMapCandidateStateValidator statevalidation.NetMapCandidateValidator
@ -76,7 +72,6 @@ func (s *Server) initNetmapProcessor(cfg *viper.Viper,
NodeStateSettings: netSettings,
})
if err != nil {
return err
}

2
pkg/local_object_storage/blobstor/blobovniczatree/cache.go
View file

@ -24,7 +24,7 @@ type dbCache struct {
}
func newDBCache(size int, ttl time.Duration, dbManager *dbManager) *dbCache {
cache := expirable.NewLRU[string, *sharedDB](size, func(_ string, evictedDB *sharedDB) {
cache := expirable.NewLRU(size, func(_ string, evictedDB *sharedDB) {
evictedDB.Close()
}, ttl)
return &dbCache{

8
pkg/local_object_storage/engine/delete_test.go
View file

@ -49,9 +49,9 @@ func TestDeleteBigObject(t *testing.T) {
link.SetSplitID(splitID)
link.SetChildren(childIDs...)
s1 := testNewShard(t, 1)
s2 := testNewShard(t, 2)
s3 := testNewShard(t, 3)
s1 := testNewShard(t)
s2 := testNewShard(t)
s3 := testNewShard(t)
e := testNewEngine(t).setInitializedShards(t, s1, s2, s3).engine
e.log = test.NewLogger(t)
@ -119,7 +119,7 @@ func TestDeleteBigObjectWithoutGC(t *testing.T) {
link.SetSplitID(splitID)
link.SetChildren(childIDs...)
s1 := testNewShard(t, 1, shard.WithDisabledGC())
s1 := testNewShard(t, shard.WithDisabledGC())
e := testNewEngine(t).setInitializedShards(t, s1).engine
e.log = test.NewLogger(t)

12
pkg/local_object_storage/engine/engine_test.go
View file

@ -50,7 +50,7 @@ func BenchmarkExists(b *testing.B) {
func benchmarkExists(b *testing.B, shardNum int) {
shards := make([]*shard.Shard, shardNum)
for i := 0; i < shardNum; i++ {
shards[i] = testNewShard(b, i)
shards[i] = testNewShard(b)
}
e := testNewEngine(b).setInitializedShards(b, shards...).engine
@ -112,7 +112,7 @@ func (te *testEngineWrapper) setShardsNum(t testing.TB, num int) *testEngineWrap
shards := make([]*shard.Shard, 0, num)
for i := 0; i < num; i++ {
shards = append(shards, testNewShard(t, i))
shards = append(shards, testNewShard(t))
}
return te.setInitializedShards(t, shards...)
@ -130,7 +130,7 @@ func (te *testEngineWrapper) setShardsNumOpts(t testing.TB, num int, shardOpts f
func (te *testEngineWrapper) setShardsNumAdditionalOpts(t testing.TB, num int, shardOpts func(id int) []shard.Option) *testEngineWrapper {
for i := 0; i < num; i++ {
defaultOpts := testDefaultShardOptions(t, i)
defaultOpts := testDefaultShardOptions(t)
opts := append(defaultOpts, shardOpts(i)...)
id, err := te.engine.AddShard(context.Background(), opts...)
require.NoError(t, err)
@ -187,11 +187,11 @@ func newTestStorages(root string, smallSize uint64) ([]blobstor.SubStorage, *tes
}, smallFileStorage, largeFileStorage
}
func testNewShard(t testing.TB, id int, opts ...shard.Option) *shard.Shard {
func testNewShard(t testing.TB, opts ...shard.Option) *shard.Shard {
sid, err := generateShardID()
require.NoError(t, err)
shardOpts := append([]shard.Option{shard.WithID(sid)}, testDefaultShardOptions(t, id)...)
shardOpts := append([]shard.Option{shard.WithID(sid)}, testDefaultShardOptions(t)...)
s := shard.New(append(shardOpts, opts...)...)
require.NoError(t, s.Open(context.Background()))
@ -200,7 +200,7 @@ func testNewShard(t testing.TB, id int, opts ...shard.Option) *shard.Shard {
return s
}
func testDefaultShardOptions(t testing.TB, id int) []shard.Option {
func testDefaultShardOptions(t testing.TB) []shard.Option {
return []shard.Option{
shard.WithLogger(test.NewLogger(t)),
shard.WithBlobStorOptions(

4
pkg/local_object_storage/engine/head_test.go
View file

@ -39,8 +39,8 @@ func TestHeadRaw(t *testing.T) {
link.SetSplitID(splitID)
t.Run("virtual object split in different shards", func(t *testing.T) {
s1 := testNewShard(t, 1)
s2 := testNewShard(t, 2)
s1 := testNewShard(t)
s2 := testNewShard(t)
e := testNewEngine(t).setInitializedShards(t, s1, s2).engine
defer e.Close(context.Background())

4
pkg/local_object_storage/engine/inhume_test.go
View file

@ -56,8 +56,8 @@ func TestStorageEngine_Inhume(t *testing.T) {
t.Run("delete big object", func(t *testing.T) {
t.Parallel()
s1 := testNewShard(t, 1)
s2 := testNewShard(t, 2)
s1 := testNewShard(t)
s2 := testNewShard(t)
e := testNewEngine(t).setInitializedShards(t, s1, s2).engine
defer e.Close(context.Background())

6
pkg/local_object_storage/metabase/put_test.go
View file

@ -18,7 +18,7 @@ import (
"github.com/stretchr/testify/require"
)
func prepareObjects(t testing.TB, n int) []*objectSDK.Object {
func prepareObjects(n int) []*objectSDK.Object {
cnr := cidtest.ID()
parentID := objecttest.ID()
objs := make([]*objectSDK.Object, n)
@ -53,7 +53,7 @@ func BenchmarkPut(b *testing.B) {
var index atomic.Int64
index.Store(-1)
objs := prepareObjects(b, b.N)
objs := prepareObjects(b.N)
b.ResetTimer()
b.ReportAllocs()
b.RunParallel(func(pb *testing.PB) {
@ -71,7 +71,7 @@ func BenchmarkPut(b *testing.B) {
defer func() { require.NoError(b, db.Close()) }()
var index atomic.Int64
index.Store(-1)
objs := prepareObjects(b, b.N)
objs := prepareObjects(b.N)
b.ResetTimer()
b.ReportAllocs()
for i := 0; i < b.N; i++ {

4
pkg/services/object/ape/checker_test.go
View file

@ -82,7 +82,7 @@ func stringPtr(s string) *string {
return &s
}
func newHeaderObjectSDK(t *testing.T, cnr cid.ID, oid *oid.ID, headerObjSDK *headerObjectSDKParams) *objectSDK.Object {
func newHeaderObjectSDK(cnr cid.ID, oid *oid.ID, headerObjSDK *headerObjectSDKParams) *objectSDK.Object {
objSDK := objectSDK.New()
objSDK.SetContainerID(cnr)
if oid != nil {
@ -344,7 +344,7 @@ func TestAPECheck(t *testing.T) {
var headerObjSDK *objectSDK.Object
if test.header.headerObjSDK != nil {
headerObjSDK = newHeaderObjectSDK(t, cnr, obj, test.header.headerObjSDK)
headerObjSDK = newHeaderObjectSDK(cnr, obj, test.header.headerObjSDK)
if test.header.fromHeaderProvider {
require.NotNil(t, obj, "oid is required if a header is expected to be found in header provider")
headerProvider.addHeader(cnr, *obj, headerObjSDK)

4
pkg/services/object/ape/request_test.go
View file

@ -80,7 +80,7 @@ func TestObjectProperties(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
cnr := newContainerIDSDK(t, test.container)
obj := newObjectIDSDK(t, test.object)
header := newHeaderObjectSDK(t, cnr, obj, test.header)
header := newHeaderObjectSDK(cnr, obj, test.header)
props := objectProperties(cnr, obj, header.ToV2().GetHeader())
require.Equal(t, test.container, props[nativeschema.PropertyKeyObjectContainerID])
@ -223,7 +223,7 @@ func TestNewAPERequest(t *testing.T) {
var headerObjSDK *objectSDK.Object
if test.header.headerObjSDK != nil {
headerObjSDK = newHeaderObjectSDK(t, cnr, obj, test.header.headerObjSDK)
headerObjSDK = newHeaderObjectSDK(cnr, obj, test.header.headerObjSDK)
if test.header.fromHeaderProvider {
require.NotNil(t, obj, "oid is required if a header is expected to be found in header provider")
headerSource.addHeader(cnr, *obj, headerObjSDK)

12
pkg/services/object_manager/placement/traverser_test.go
View file

@ -40,7 +40,7 @@ func copyVectors(v [][]netmap.NodeInfo) [][]netmap.NodeInfo {
return vc
}
func testPlacement(t *testing.T, ss, rs []int) ([][]netmap.NodeInfo, container.Container) {
func testPlacement(ss, rs []int) ([][]netmap.NodeInfo, container.Container) {
nodes := make([][]netmap.NodeInfo, 0, len(rs))
replicas := make([]netmap.ReplicaDescriptor, 0, len(rs))
num := uint32(0)
@ -83,7 +83,7 @@ func TestTraverserObjectScenarios(t *testing.T) {
selectors := []int{2, 3}
replicas := []int{1, 2}
nodes, cnr := testPlacement(t, selectors, replicas)
nodes, cnr := testPlacement(selectors, replicas)
nodesCopy := copyVectors(nodes)
@ -112,7 +112,7 @@ func TestTraverserObjectScenarios(t *testing.T) {
selectors := []int{5, 3}
replicas := []int{2, 2}
nodes, cnr := testPlacement(t, selectors, replicas)
nodes, cnr := testPlacement(selectors, replicas)
nodesCopy := copyVectors(nodes)
@ -141,7 +141,7 @@ func TestTraverserObjectScenarios(t *testing.T) {
selectors := []int{5, 3}
replicas := []int{2, 2}
nodes, cnr := testPlacement(t, selectors, replicas)
nodes, cnr := testPlacement(selectors, replicas)
nodesCopy := copyVectors(nodes)
@ -184,7 +184,7 @@ func TestTraverserObjectScenarios(t *testing.T) {
selectors := []int{2, 3}
replicas := []int{1, 2}
nodes, cnr := testPlacement(t, selectors, replicas)
nodes, cnr := testPlacement(selectors, replicas)
tr, err := NewTraverser(
ForContainer(cnr),
@ -213,7 +213,7 @@ func TestTraverserRemValues(t *testing.T) {
selectors := []int{3, 4, 5}
replicas := []int{2, 3, 4}
nodes, cnr := testPlacement(t, selectors, replicas)
nodes, cnr := testPlacement(selectors, replicas)
nodesCopy := copyVectors(nodes)
testCases := [...]struct {

2
pkg/services/tree/cache.go
View file

@ -35,7 +35,7 @@ const (
var errRecentlyFailed = errors.New("client has recently failed")
func (c *clientCache) init() {
l, _ := simplelru.NewLRU[string, cacheItem](defaultClientCacheSize, func(_ string, value cacheItem) {
l, _ := simplelru.NewLRU(defaultClientCacheSize, func(_ string, value cacheItem) {
if conn := value.cc; conn != nil {
_ = conn.Close()
}

2
pkg/services/tree/sync.go
View file

@ -251,7 +251,7 @@ func (s *Service) startStream(ctx context.Context, cid cid.ID, treeID string,
}
opsCh <- m
}
if err != nil && !errors.Is(err, io.EOF) {
if !errors.Is(err, io.EOF) {
return err
}
return nil