Skip to content

Commit dd48151

Browse files
committed
kvnemesis: rename Restarter interface to ServerController
Previously, the interface for controlling test servers was named `Restarter`, which only described one of its methods. This was inadequate because the interface also provides `StopServer`, and future changes will add more server control methods like `CrashServer`. This patch renames `Restarter` to `ServerController` to better reflect its broader purpose of controlling server lifecycle operations. All references to the interface and its field in `Env` have been updated accordingly. Release note: None Informs: #64828
1 parent e15f584 commit dd48151

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

pkg/kv/kvnemesis/applier.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,12 @@ func (a *Applier) applyOp(ctx context.Context, db *kv.DB, op *Operation) {
182182
o.Result = resultInit(ctx, err)
183183
case *StopNodeOperation:
184184
serverID := int(o.NodeId) - 1
185-
a.env.Restarter.StopServer(serverID)
185+
a.env.ServerController.StopServer(serverID)
186186
a.nodes.setStopped(int(o.NodeId))
187187
o.Result = resultInit(ctx, nil)
188188
case *RestartNodeOperation:
189189
serverID := int(o.NodeId) - 1
190-
err := a.env.Restarter.RestartServer(serverID)
190+
err := a.env.ServerController.RestartServer(serverID)
191191
a.nodes.setRunning(int(o.NodeId))
192192
o.Result = resultInit(ctx, err)
193193
case *ClosureTxnOperation:

pkg/kv/kvnemesis/env.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ type Logger interface {
2727
WriteFile(basename string, contents string) string
2828
}
2929

30-
type Restarter interface {
30+
type ServerController interface {
3131
StopServer(idx int)
3232
RestartServer(idx int) error
3333
}
3434

3535
// Env manipulates the environment (cluster settings, zone configurations) that
3636
// the Applier operates in.
3737
type Env struct {
38-
SQLDBs []*gosql.DB
39-
Tracker *SeqTracker
40-
L Logger
41-
Partitioner *rpc.Partitioner
42-
Restarter Restarter
38+
SQLDBs []*gosql.DB
39+
Tracker *SeqTracker
40+
L Logger
41+
Partitioner *rpc.Partitioner
42+
ServerController ServerController
4343
}
4444

4545
func (e *Env) anyNode() *gosql.DB {

pkg/kv/kvnemesis/kvnemesis.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func RunNemesis(
197197
}
198198
env.Partitioner.EnablePartitions(false)
199199
for i := 0; i < config.NumNodes; i++ {
200-
_ = env.Restarter.RestartServer(i)
200+
_ = env.ServerController.RestartServer(i)
201201
}
202202

203203
allSteps := make(steps, 0, numSteps)

pkg/kv/kvnemesis/kvnemesis_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ func testKVNemesisImpl(t testing.TB, cfg kvnemesisTestCfg) {
697697

698698
logger := newTBridge(t)
699699
defer dumpRaftLogsOnFailure(t, logger.ll.dir, tc.Servers)
700-
env := &Env{SQLDBs: sqlDBs, Tracker: tr, L: logger, Partitioner: &partitioner, Restarter: tc}
700+
env := &Env{SQLDBs: sqlDBs, Tracker: tr, L: logger, Partitioner: &partitioner, ServerController: tc}
701701
failures, err := RunNemesis(ctx, rng, env, config, cfg.concurrency, cfg.numSteps, cfg.mode, dbs...)
702702

703703
logMetricsReport(t, tc)

0 commit comments

Comments
 (0)