Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the auto-compaction-retention logging in the startup #17986

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix the auto-compaction-retention logging in the startup #17986

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d537fcc
etcdserver: fix the auto-compaction-retention logging in the startup
akin-tekeoglu May 12, 2024
005ef87
etcdserver: rename log field
akin-tekeoglu May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions server/embed/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
"github.com/soheilhy/cmux"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/keepalive"
Expand All @@ -48,6 +49,7 @@ import (
"go.etcd.io/etcd/server/v3/etcdserver"
"go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp"
"go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp"
compactor "go.etcd.io/etcd/server/v3/etcdserver/api/v3compactor"
"go.etcd.io/etcd/server/v3/storage"
"go.etcd.io/etcd/server/v3/verify"
)
Expand Down Expand Up @@ -307,6 +309,12 @@ func print(lg *zap.Logger, ec Config, sc config.ServerConfig, memberInitialized
if quota == 0 {
quota = storage.DefaultQuotaBytes
}
var autoCompactionRetention zapcore.Field
if sc.AutoCompactionMode == compactor.ModePeriodic {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is type alias for compactor.ModePeriodc in server/embed: CompactorModePeriodic.

Please consider to use switch branch because that mode can be invalid, like empty.

autoCompactionRetention = zap.Duration("auto-compaction-retention", sc.AutoCompactionRetention)
} else {
autoCompactionRetention = zap.Int64("auto-compaction-retention", int64(sc.AutoCompactionRetention))
}

lg.Info(
"starting an etcd server",
Expand Down Expand Up @@ -351,8 +359,7 @@ func print(lg *zap.Logger, ec Config, sc config.ServerConfig, memberInitialized
zap.Bool("compact-check-time-enabled", sc.CompactHashCheckEnabled),
zap.Duration("compact-check-time-interval", sc.CompactHashCheckTime),
zap.String("auto-compaction-mode", sc.AutoCompactionMode),
zap.Duration("auto-compaction-retention", sc.AutoCompactionRetention),
zap.String("auto-compaction-interval", sc.AutoCompactionRetention.String()),
autoCompactionRetention,
zap.String("discovery-url", sc.DiscoveryURL),
zap.String("discovery-proxy", sc.DiscoveryProxy),

Expand Down
Loading