Cleanup some e2e test configurations
Notes:
1. compactPhysical in ctlCtx and withQuota aren't used at all, they are dead code.
2. quotaBackendBytes in ctlCtx isn't used either. Instead, users (test cases) set the QuotaBackendBytes directly.
@@ -124,7 +124,6 @@ type ctlCtx struct {
t *testing.T
apiPrefix string
cfg e2e.EtcdProcessClusterConfig
- quotaBackendBytes int64
corruptFunc func(string) error
noStrictReconfig bool
@@ -143,9 +142,6 @@ type ctlCtx struct {
initialCorruptCheck bool
- // for compaction
- compactPhysical bool
-
// dir that was used during the test
dataDir string
}
@@ -156,6 +152,7 @@ func (cx *ctlCtx) applyOpts(opts []ctlOption) {
for _, opt := range opts {
opt(cx)
}
+
cx.initialCorruptCheck = true
}
@@ -179,10 +176,6 @@ func withInteractive() ctlOption {
return func(cx *ctlCtx) { cx.interactive = true }
}
-func withQuota(b int64) ctlOption {
- return func(cx *ctlCtx) { cx.quotaBackendBytes = b }
-}
-
func withInitialCorruptCheck() ctlOption {
return func(cx *ctlCtx) { cx.initialCorruptCheck = true }
}
@@ -232,9 +225,6 @@ func testCtlWithOffline(t *testing.T, testFunc func(ctlCtx), testOfflineFunc fun
if !ret.quorum {
ret.cfg = *e2e.ConfigStandalone(ret.cfg)
}
- if ret.quotaBackendBytes > 0 {
- ret.cfg.QuotaBackendBytes = ret.quotaBackendBytes
- }
ret.cfg.NoStrictReconfig = ret.noStrictReconfig
if ret.initialCorruptCheck {
ret.cfg.InitialCorruptCheck = ret.initialCorruptCheck
