TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 105 Pull requests 11 Projects Releases 2 Activity Actions

Fix flaky test #795

Merged
dstepanov-yadro merged 2 commits from dstepanov-yadro/frostfs-node:fix/test_lock_expiration into master 2024-09-04 19:51:04 +00:00
Conversation 0 Commits 2 Files changed 2 +8 -11
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1b22801eed - Show all commits

19
pkg/local_object_storage/engine/lock_test.go
View file

@ -137,13 +137,12 @@ func TestLockUserScenario(t *testing.T) {
// 5. // 5.
e.HandleNewEpoch(lockerExpiresAfter + 1) e.HandleNewEpoch(lockerExpiresAfter + 1)
// delay for GC
time.Sleep(time.Second)
fyrchik commented 2023-11-09 08:23:55 +00:00
Review
Copy link

I think what we really need is manual GC execution: can we e.g. call removeGarbage explicitly or is it too much refactoring?

I think what we really need is manual GC execution: can we e.g. call `removeGarbage` explicitly or is it too much refactoring?
inhumePrm.WithTarget(tombAddr, objAddr) inhumePrm.WithTarget(tombAddr, objAddr)
_, err = e.Inhume(context.Background(), inhumePrm) require.Eventually(t, func() bool {
require.NoError(t, err) _, err = e.Inhume(context.Background(), inhumePrm)
return err == nil
}, 30*time.Second, time.Second)
} }
func TestLockExpiration(t *testing.T) { func TestLockExpiration(t *testing.T) {
@ -213,15 +212,13 @@ func TestLockExpiration(t *testing.T) {
// 3. // 3.
e.HandleNewEpoch(lockerExpiresAfter + 1) e.HandleNewEpoch(lockerExpiresAfter + 1)
// delay for GC processing. It can't be estimated, but making it bigger
// will slow down test
time.Sleep(time.Second)
// 4. // 4.
inhumePrm.WithTarget(oidtest.Address(), objectcore.AddressOf(obj)) inhumePrm.WithTarget(oidtest.Address(), objectcore.AddressOf(obj))
_, err = e.Inhume(context.Background(), inhumePrm) require.Eventually(t, func() bool {
require.NoError(t, err) _, err = e.Inhume(context.Background(), inhumePrm)
return err == nil
}, 30*time.Second, time.Second)
} }
func TestLockForceRemoval(t *testing.T) { func TestLockForceRemoval(t *testing.T) {