Move selectStartGear lock from Handler into Engines (#2182)

Author: StephenButtolph

snow/engine/avalanche/bootstrap/bootstrapper.go

@@ -89,7 +89,10 @@ type bootstrapper struct {
 	processedCache *cache.LRU[ids.ID, struct{}]
 }
 
-func (b *bootstrapper) Clear() error {
+func (b *bootstrapper) Clear(context.Context) error {
+	b.Ctx.Lock.Lock()
+	defer b.Ctx.Lock.Unlock()
+
 	if err := b.VtxBlocked.Clear(); err != nil {
 		return err
 	}

snow/engine/common/bootstrapable.go

@@ -21,5 +21,5 @@ type Bootstrapable interface {
 	ForceAccepted(ctx context.Context, acceptedContainerIDs []ids.ID) error
 
 	// Clear removes all containers to be processed upon bootstrapping
-	Clear() error
+	Clear(ctx context.Context) error
 }

snow/engine/common/test_bootstrapable.go

@@ -26,7 +26,7 @@ type BootstrapableTest struct {
 
 	CantForceAccepted, CantClear bool
 
-	ClearF         func() error
+	ClearF         func(ctx context.Context) error
 	ForceAcceptedF func(ctx context.Context, acceptedContainerIDs []ids.ID) error
 }
 
@@ -35,9 +35,9 @@ func (b *BootstrapableTest) Default(cant bool) {
 	b.CantForceAccepted = cant
 }
 
-func (b *BootstrapableTest) Clear() error {
+func (b *BootstrapableTest) Clear(ctx context.Context) error {
 	if b.ClearF != nil {
-		return b.ClearF()
+		return b.ClearF(ctx)
 	}
 	if b.CantClear && b.T != nil {
 		require.FailNow(b.T, errClear.Error())

snow/engine/common/traced_bootstrapable_engine.go

@@ -38,6 +38,9 @@ func (e *tracedBootstrapableEngine) ForceAccepted(ctx context.Context, acceptedC
 	return e.bootstrapableEngine.ForceAccepted(ctx, acceptedContainerIDs)
 }
 
-func (e *tracedBootstrapableEngine) Clear() error {
-	return e.bootstrapableEngine.Clear()
+func (e *tracedBootstrapableEngine) Clear(ctx context.Context) error {
+	ctx, span := e.tracer.Start(ctx, "tracedBootstrapableEngine.Clear")
+	defer span.End()
+
+	return e.bootstrapableEngine.Clear(ctx)
 }

snow/engine/snowman/bootstrap/bootstrapper.go

@@ -412,7 +412,10 @@ func (b *bootstrapper) markUnavailable(nodeID ids.NodeID) {
 	}
 }
 
-func (b *bootstrapper) Clear() error {
+func (b *bootstrapper) Clear(context.Context) error {
+	b.Ctx.Lock.Lock()
+	defer b.Ctx.Lock.Unlock()
+
 	if err := b.Config.Blocked.Clear(); err != nil {
 		return err
 	}

snow/engine/snowman/syncer/state_syncer.go

@@ -625,5 +625,8 @@ func (ss *stateSyncer) IsEnabled(ctx context.Context) (bool, error) {
 		return false, nil
 	}
 
+	ss.Ctx.Lock.Lock()
+	defer ss.Ctx.Lock.Unlock()
+
 	return ss.stateSyncVM.StateSyncEnabled(ctx)
 }

snow/networking/handler/handler.go

@@ -216,11 +216,10 @@ func (h *handler) selectStartingGear(ctx context.Context) (common.Engine, error)
 	}
 
 	// drop bootstrap state from previous runs before starting state sync
-	return engines.StateSyncer, engines.Bootstrapper.Clear()
+	return engines.StateSyncer, engines.Bootstrapper.Clear(ctx)
 }
 
 func (h *handler) Start(ctx context.Context, recoverPanic bool) {
-	h.ctx.Lock.Lock()
 	gear, err := h.selectStartingGear(ctx)
 	if err != nil {
 		h.ctx.Lock.Unlock()
@@ -232,6 +231,7 @@ func (h *handler) Start(ctx context.Context, recoverPanic bool) {
 		return
 	}
 
+	h.ctx.Lock.Lock()
 	err = gear.Start(ctx, 0)
 	h.ctx.Lock.Unlock()
 	if err != nil {