Merge pull request #345 from ishan16696/working

Set the auto-compaction fields for Embedded-Etcd.
gardener · Jun 30, 2021 · 43af3ca · 43af3ca
2 parents 1bc7b57 + 2b50ed5
commit 43af3ca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/pkg/miscellaneous/miscellaneous.go b/pkg/miscellaneous/miscellaneous.go
@@ -81,6 +81,8 @@ func StartEmbeddedEtcd(logger *logrus.Entry, ro *brtypes.RestoreOptions) (*embed
 	cfg.QuotaBackendBytes = ro.Config.EmbeddedEtcdQuotaBytes
 	cfg.MaxRequestBytes = ro.Config.MaxRequestBytes
 	cfg.MaxTxnOps = ro.Config.MaxTxnOps
+	cfg.AutoCompactionMode = ro.Config.AutoCompactionMode
+	cfg.AutoCompactionRetention = ro.Config.AutoCompactionRetention
 	cfg.Logger = "zap"
 	e, err := embed.StartEtcd(cfg)
 	if err != nil {

diff --git a/pkg/snapshot/restorer/restorer_test.go b/pkg/snapshot/restorer/restorer_test.go
@@ -65,7 +65,7 @@ var _ = Describe("Running Restorer", func() {
 		maxTxnOps                      = 2 * 1024
 		embeddedEtcdQuotaBytes  int64  = 8 * 1024 * 1024 * 1024
 		autoCompactionMode      string = "periodic"
-		autoCompactionRetention string = "2m"
+		autoCompactionRetention string = "5m"
 	)
 
 	BeforeEach(func() {

diff --git a/test/utils/utils.go b/test/utils/utils.go
@@ -65,6 +65,8 @@ func StartEmbeddedEtcd(ctx context.Context, etcdDir string, logger *logrus.Entry
 	cfg.ACUrls = []url.URL{*acurl}
 	cfg.InitialCluster = cfg.InitialClusterFromName(cfg.Name)
 	cfg.Logger = "zap"
+	cfg.AutoCompactionMode = "periodic"
+	cfg.AutoCompactionRetention = "5m"
 	e, err := embed.StartEtcd(cfg)
 	if err != nil {
 		return nil, err