[#1705] engine: Use condition var for evacuation unit tests

To know exactly when the evacuation was completed,
a conditional variable was added.

Closes #1705

Change-Id: I86f6d7d2ad2b9759905b6b5e9341008cb74f5dfd
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>

pkg/local_object_storage/engine/engine.go

@@ -212,12 +212,18 @@ func New(opts ...Option) *StorageEngine {
 		opts[i](c)
 	}
 
+	evLimMtx := &sync.RWMutex{}
+	evLimCond := sync.NewCond(evLimMtx)
+
 	return &StorageEngine{
-		cfg:             c,
-		shards:          make(map[string]hashedShard),
-		closeCh:         make(chan struct{}),
-		setModeCh:       make(chan setModeRequest),
-		evacuateLimiter: &evacuationLimiter{},
+		cfg:       c,
+		shards:    make(map[string]hashedShard),
+		closeCh:   make(chan struct{}),
+		setModeCh: make(chan setModeRequest),
+		evacuateLimiter: &evacuationLimiter{
+			guard:      evLimMtx,
+			statusCond: evLimCond,
+		},
 	}
 }
 

pkg/local_object_storage/engine/evacuate_limiter.go

@@ -139,7 +139,8 @@ type evacuationLimiter struct {
 	eg     *errgroup.Group
 	cancel context.CancelFunc
 
-	guard sync.RWMutex
+	guard      *sync.RWMutex
+	statusCond *sync.Cond // used in unit tests
 }
 
 func (l *evacuationLimiter) TryStart(ctx context.Context, shardIDs []string, result *EvacuateShardRes) (*errgroup.Group, context.Context, error) {
@@ -165,6 +166,7 @@ func (l *evacuationLimiter) TryStart(ctx context.Context, shardIDs []string, res
 		startedAt:    time.Now().UTC(),
 		result:       result,
 	}
+	l.statusCond.Broadcast()
 
 	return l.eg, egCtx, nil
 }
@@ -180,6 +182,7 @@ func (l *evacuationLimiter) Complete(err error) {
 	l.state.processState = EvacuateProcessStateCompleted
 	l.state.errMessage = errMsq
 	l.state.finishedAt = time.Now().UTC()
+	l.statusCond.Broadcast()
 
 	l.eg = nil
 }
@@ -214,6 +217,7 @@ func (l *evacuationLimiter) ResetEvacuationStatus() error {
 	l.state = EvacuationState{}
 	l.eg = nil
 	l.cancel = nil
+	l.statusCond.Broadcast()
 
 	return nil
 }

pkg/local_object_storage/engine/evacuate_test.go

@@ -204,11 +204,10 @@ func TestEvacuateShardObjects(t *testing.T) {
 func testWaitForEvacuationCompleted(t *testing.T, e *StorageEngine) *EvacuationState {
 	var st *EvacuationState
 	var err error
-	require.Eventually(t, func() bool {
-		st, err = e.GetEvacuationState(context.Background())
-		require.NoError(t, err)
-		return st.ProcessingStatus() == EvacuateProcessStateCompleted
-	}, 6*time.Second, 10*time.Millisecond)
+	e.evacuateLimiter.waitForCompleted()
+	st, err = e.GetEvacuationState(context.Background())
+	require.NoError(t, err)
+	require.Equal(t, EvacuateProcessStateCompleted, st.ProcessingStatus())
 	return st
 }
 
@@ -817,3 +816,12 @@ func TestEvacuateShardObjectsRepOneOnlyBench(t *testing.T) {
 	t.Logf("evacuate took %v\n", time.Since(start))
 	require.NoError(t, err)
 }
+
+func (l *evacuationLimiter) waitForCompleted() {
+	l.guard.Lock()
+	defer l.guard.Unlock()
+
+	for l.state.processState != EvacuateProcessStateCompleted {
+		l.statusCond.Wait()
+	}
+}