Skip to content

Fix bug in F3 stop and use start/stop in catchup tests #1029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masih merged 1 commit into from
Jun 27, 2025
Merged

Fix bug in F3 stop and use start/stop in catchup tests #1029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions f3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ func (m *F3) Start(startCtx context.Context) (_err error) {
}

// Stop F3.
func (m *F3) Stop(context.Context) (_err error) {
func (m *F3) Stop(ctx context.Context) (_err error) {
m.cancelCtx()
return nil
return m.stopInternal(ctx)
}

func (s *f3State) stop(ctx context.Context) (err error) {
Expand Down
16 changes: 0 additions & 16 deletions f3_helpers_test.go
View file
Open in desktop

This file was deleted.

29 changes: 15 additions & 14 deletions f3_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func TestF3WithLookback(t *testing.T) {
env.requireInstanceEventually(5, eventualCheckTimeout, true)
}

func TestF3PauseResumeCatchup(t *testing.T) {
func TestF3StopStartCatchup(t *testing.T) {
// Quiet down the logs since the test asserts a scenario that triggers
// OhShitStore ERROR level logs.
_ = logging.SetLogLevel("f3/ohshitstore", "DPANIC")
Expand All @@ -104,8 +104,8 @@ func TestF3PauseResumeCatchup(t *testing.T) {
env.requireEpochFinalizedEventually(env.manifest.BootstrapEpoch, eventualCheckTimeout)

// Pausing two nodes should pause the network.
env.pauseNode(1)
env.pauseNode(2)
env.stopNode(1)
env.stopNode(2)

env.requireF3NotRunningEventually(eventualCheckTimeout, nodeMatchers.byID(1, 2))

Expand All @@ -118,22 +118,23 @@ func TestF3PauseResumeCatchup(t *testing.T) {
}, eventualCheckTimeout, eventualCheckInterval)

// Resuming node 1 should continue agreeing on instances.
env.resumeNode(1)
env.startNode(1)
env.connectAll()
env.requireF3RunningEventually(eventualCheckTimeout, nodeMatchers.byID(1))

// Wait until we're far enough that pure GPBFT catchup should be impossible.
targetInstance := env.nodes[1].currentGpbftInstance() + env.manifest.CommitteeLookback + 1
env.requireInstanceEventually(targetInstance, eventualCheckTimeout, false)

env.resumeNode(2)
env.startNode(2)
env.requireF3RunningEventually(eventualCheckTimeout, nodeMatchers.byID(2))

// Everyone should catch up eventually
env.requireInstanceEventually(targetInstance, eventualCheckTimeout, true)

// Pause the "good" node.
node0failInstance := env.nodes[0].currentGpbftInstance()
env.pauseNode(0)
env.stopNode(0)
env.requireF3NotRunningEventually(eventualCheckTimeout, nodeMatchers.byID(0))

// We should be able to make progress with the remaining nodes.
Expand Down Expand Up @@ -337,12 +338,12 @@ func (n *testNode) init() *f3.F3 {
return n.f3
}

func (n *testNode) pause() {
require.NoError(n.e.t, n.f3.Pause(n.e.testCtx))
func (n *testNode) stop() {
require.NoError(n.e.t, n.f3.Stop(n.e.testCtx))
}

func (n *testNode) resume() {
require.NoError(n.e.t, n.f3.Resume(n.e.testCtx))
func (n *testNode) start() {
require.NoError(n.e.t, n.f3.Start(n.e.testCtx))
}

type testNodeStatus struct {
Expand Down Expand Up @@ -629,12 +630,12 @@ func (e *testEnv) withManifest(m manifest.Manifest) *testEnv {
return e
}

func (e *testEnv) pauseNode(i int) {
e.nodes[i].pause()
func (e *testEnv) stopNode(i int) {
e.nodes[i].stop()
}

func (e *testEnv) resumeNode(i int) {
e.nodes[i].resume()
func (e *testEnv) startNode(i int) {
e.nodes[i].start()
}

func (e *testEnv) injectDatastoreFailures(i int, fn func(op string) error) {
Expand Down
Loading