[#9999] shard: Resolve linters
Some checks failed
DCO action / DCO (pull_request) Successful in 11m40s
Build / Build Components (1.22) (pull_request) Failing after 14m58s
Build / Build Components (1.21) (pull_request) Successful in 18m52s
Vulncheck / Vulncheck (pull_request) Successful in 23m2s
Tests and linters / Tests (1.21) (pull_request) Failing after 29m16s
Tests and linters / Tests with -race (pull_request) Failing after 29m15s
Tests and linters / Tests (1.22) (pull_request) Failing after 30m51s
Tests and linters / Staticcheck (pull_request) Successful in 33m34s
Tests and linters / Lint (pull_request) Successful in 34m7s
Tests and linters / gopls check (pull_request) Failing after 34m32s
Pre-commit hooks / Pre-commit (pull_request) Successful in 34m27s
Some checks failed
DCO action / DCO (pull_request) Successful in 11m40s
Build / Build Components (1.22) (pull_request) Failing after 14m58s
Build / Build Components (1.21) (pull_request) Successful in 18m52s
Vulncheck / Vulncheck (pull_request) Successful in 23m2s
Tests and linters / Tests (1.21) (pull_request) Failing after 29m16s
Tests and linters / Tests with -race (pull_request) Failing after 29m15s
Tests and linters / Tests (1.22) (pull_request) Failing after 30m51s
Tests and linters / Staticcheck (pull_request) Successful in 33m34s
Tests and linters / Lint (pull_request) Successful in 34m7s
Tests and linters / gopls check (pull_request) Failing after 34m32s
Pre-commit hooks / Pre-commit (pull_request) Successful in 34m27s
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
parent
a4602e1183
commit
3db4900a4b
6 changed files with 10 additions and 10 deletions
|
@ -277,7 +277,7 @@ func (e *StorageEngine) processExpiredLocks(ctx context.Context, epoch uint64, l
|
|||
|
||||
func (e *StorageEngine) processDeletedLocks(ctx context.Context, lockers []oid.Address) {
|
||||
e.iterateOverUnsortedShards(func(sh hashedShard) (stop bool) {
|
||||
sh.HandleDeletedLocks(lockers)
|
||||
sh.HandleDeletedLocks(ctx, lockers)
|
||||
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
|
|
|
@ -410,7 +410,7 @@ func (s *Shard) Reload(ctx context.Context, opts ...Option) error {
|
|||
// config after the node was updated.
|
||||
err = s.refillMetabase(ctx)
|
||||
} else {
|
||||
err = s.metaBase.Init()
|
||||
err = s.metaBase.Init2(ctx)
|
||||
}
|
||||
if err != nil {
|
||||
s.log.Error(logs.ShardCantInitializeMetabaseMoveToADegradedreadonlyMode, zap.Error(err))
|
||||
|
|
|
@ -730,12 +730,12 @@ func (s *Shard) inhumeUnlockedIfExpired(ctx context.Context, epoch uint64, unloc
|
|||
}
|
||||
|
||||
// HandleDeletedLocks unlocks all objects which were locked by lockers.
|
||||
func (s *Shard) HandleDeletedLocks(lockers []oid.Address) {
|
||||
func (s *Shard) HandleDeletedLocks(ctx context.Context, lockers []oid.Address) {
|
||||
if s.GetMode().NoMetabase() {
|
||||
return
|
||||
}
|
||||
|
||||
_, err := s.metaBase.FreeLockedBy(context.TODO(), lockers)
|
||||
_, err := s.metaBase.FreeLockedBy(ctx, lockers)
|
||||
if err != nil {
|
||||
s.log.Warn(logs.ShardFailureToUnlockObjects,
|
||||
zap.String("error", err.Error()),
|
||||
|
|
|
@ -61,8 +61,8 @@ func Test_ObjectNotFoundIfNotDeletedFromMetabase(t *testing.T) {
|
|||
meta.WithEpochState(epochState{}),
|
||||
),
|
||||
WithPiloramaOptions(pilorama.WithPath(filepath.Join(rootPath, "pilorama"))),
|
||||
WithDeletedLockCallback(func(_ context.Context, addresses []oid.Address) {
|
||||
sh.HandleDeletedLocks(addresses)
|
||||
WithDeletedLockCallback(func(ctx context.Context, addresses []oid.Address) {
|
||||
sh.HandleDeletedLocks(ctx, addresses)
|
||||
}),
|
||||
WithExpiredLocksCallback(func(ctx context.Context, epoch uint64, a []oid.Address) {
|
||||
sh.HandleExpiredLocks(ctx, epoch, a)
|
||||
|
|
|
@ -53,8 +53,8 @@ func TestShard_Lock(t *testing.T) {
|
|||
meta.WithPath(filepath.Join(rootPath, "meta")),
|
||||
meta.WithEpochState(epochState{}),
|
||||
),
|
||||
WithDeletedLockCallback(func(_ context.Context, addresses []oid.Address) {
|
||||
sh.HandleDeletedLocks(addresses)
|
||||
WithDeletedLockCallback(func(ctx context.Context, addresses []oid.Address) {
|
||||
sh.HandleDeletedLocks(ctx, addresses)
|
||||
}),
|
||||
}
|
||||
|
||||
|
|
|
@ -89,8 +89,8 @@ func newCustomShard(t testing.TB, enableWriteCache bool, o shardOptions) *Shard
|
|||
WithPiloramaOptions(pilorama.WithPath(filepath.Join(o.rootPath, "pilorama"))),
|
||||
WithWriteCache(enableWriteCache),
|
||||
WithWriteCacheOptions(o.wcOpts),
|
||||
WithDeletedLockCallback(func(_ context.Context, addresses []oid.Address) {
|
||||
sh.HandleDeletedLocks(addresses)
|
||||
WithDeletedLockCallback(func(ctx context.Context, addresses []oid.Address) {
|
||||
sh.HandleDeletedLocks(ctx, addresses)
|
||||
}),
|
||||
WithExpiredLocksCallback(func(ctx context.Context, epoch uint64, a []oid.Address) {
|
||||
sh.HandleExpiredLocks(ctx, epoch, a)
|
||||
|
|
Loading…
Reference in a new issue