From 2c53be7c5d91e9b618342d63d2d06c3b265abee4 Mon Sep 17 00:00:00 2001 From: Jalin Wang Date: Tue, 27 Aug 2024 21:36:06 +0800 Subject: [PATCH] etcdserver: rename defaultCompactionSleepInterval var (#18495) * etcdserver: rename `minimumBatchInterval` to `defaultCompactionSleepInterval` and `defaultCompactBatchLimit` to `defaultCompactionBatchLimit` Signed-off-by: Jalin Wang --- server/storage/mvcc/kvstore.go | 8 ++++---- server/storage/mvcc/kvstore_test.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/storage/mvcc/kvstore.go b/server/storage/mvcc/kvstore.go index 8c97323860b..9ee73cce2e9 100644 --- a/server/storage/mvcc/kvstore.go +++ b/server/storage/mvcc/kvstore.go @@ -39,8 +39,8 @@ var ( ) var restoreChunkKeys = 10000 // non-const for testing -var defaultCompactBatchLimit = 1000 -var minimumBatchInterval = 10 * time.Millisecond +var defaultCompactionBatchLimit = 1000 +var defaultCompactionSleepInterval = 10 * time.Millisecond type StoreConfig struct { CompactionBatchLimit int @@ -85,10 +85,10 @@ func NewStore(lg *zap.Logger, b backend.Backend, le lease.Lessor, cfg StoreConfi lg = zap.NewNop() } if cfg.CompactionBatchLimit == 0 { - cfg.CompactionBatchLimit = defaultCompactBatchLimit + cfg.CompactionBatchLimit = defaultCompactionBatchLimit } if cfg.CompactionSleepInterval == 0 { - cfg.CompactionSleepInterval = minimumBatchInterval + cfg.CompactionSleepInterval = defaultCompactionSleepInterval } s := &store{ cfg: cfg, diff --git a/server/storage/mvcc/kvstore_test.go b/server/storage/mvcc/kvstore_test.go index 31375dc0c4e..0523dcde983 100644 --- a/server/storage/mvcc/kvstore_test.go +++ b/server/storage/mvcc/kvstore_test.go @@ -917,7 +917,7 @@ func newFakeStore(lg *zap.Logger) *store { s := &store{ cfg: StoreConfig{ CompactionBatchLimit: 10000, - CompactionSleepInterval: minimumBatchInterval, + CompactionSleepInterval: defaultCompactionSleepInterval, }, b: b, le: &lease.FakeLessor{},