Skip to content

Commit

Permalink
Merge pull request #19140 from ahrtr/mix_version_test_20250107
Browse files Browse the repository at this point in the history
Fix mixVersion test case: ensure a snapshot to be sent out
  • Loading branch information
ahrtr authored Jan 8, 2025
2 parents aac7ef6 + 3ee0d4f commit 70a1726
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion server/etcdserver/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func bootstrapBackend(cfg config.ServerConfig, haveWAL bool, st v2store.Store, s
return nil, err
}
}
cfg.Logger.Debug("restore consistentIndex", zap.Uint64("index", ci.ConsistentIndex()))
cfg.Logger.Info("restore consistentIndex", zap.Uint64("index", ci.ConsistentIndex()))

// TODO(serathius): Implement schema setup in fresh storage
var snapshot *raftpb.Snapshot
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/etcd_mix_versions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ func mixVersionsSnapshotTestByMockPartition(t *testing.T, cfg *e2e.EtcdProcessCl
err = toPartitionedMember.Stop()
require.NoError(t, err)

t.Log("Writing 20 keys to the cluster (more than SnapshotCount entries to trigger at least a snapshot)")
writeKVs(t, epc.Etcdctl(), 0, 20)
t.Log("Writing 30 keys to the cluster (more than SnapshotCount entries to trigger at least a snapshot)")
writeKVs(t, epc.Etcdctl(), 0, 30)

t.Log("Verify logs to check leader has saved snapshot")
leaderEPC := epc.Procs[epc.WaitLeader(t)]
Expand Down

0 comments on commit 70a1726

Please sign in to comment.