Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

embed: rename "SnapshotCount", add "SnapshotCatchUpEntries"

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-05-18 14:38:39 -07:00
parent 49d672ff9b
commit afe511945e
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
embed/config.go
View File

@ -111,12 +111,23 @@ func init() {
// Config holds the arguments for configuring an etcd server. // Config holds the arguments for configuring an etcd server.
type Config struct { type Config struct {
Name string `json:"name"` Name string `json:"name"`
Dir string `json:"data-dir"` Dir string `json:"data-dir"`
WalDir string `json:"wal-dir"` WalDir string `json:"wal-dir"`
SnapCount uint64 `json:"snapshot-count"`
MaxSnapFiles uint `json:"max-snapshots"` SnapshotCount uint64 `json:"snapshot-count"`
MaxWalFiles uint `json:"max-wals"`
// SnapshotCatchUpEntries is the number of entries for a slow follower
// to catch-up after compacting the raft storage entries.
// We expect the follower has a millisecond level latency with the leader.
// The max throughput is around 10K. Keep a 5K entries is enough for helping
// follower to catch up.
// WARNING: only change this for tests.
// Always use "DefaultSnapshotCatchUpEntries"
SnapshotCatchUpEntries uint64
MaxSnapFiles uint `json:"max-snapshots"`
MaxWalFiles uint `json:"max-wals"`
// TickMs is the number of milliseconds between heartbeat ticks. // TickMs is the number of milliseconds between heartbeat ticks.
// TODO: decouple tickMs and heartbeat tick (current heartbeat tick = 1). // TODO: decouple tickMs and heartbeat tick (current heartbeat tick = 1).
@ -342,7 +353,9 @@ func NewConfig() *Config {
Name: DefaultName, Name: DefaultName,
SnapCount: etcdserver.DefaultSnapCount, SnapshotCount: etcdserver.DefaultSnapshotCount,
SnapshotCatchUpEntries: etcdserver.DefaultSnapshotCatchUpEntries,
MaxTxnOps: DefaultMaxTxnOps, MaxTxnOps: DefaultMaxTxnOps,
MaxRequestBytes: DefaultMaxRequestBytes, MaxRequestBytes: DefaultMaxRequestBytes,

2
embed/etcd.go
View File

@ -163,7 +163,7 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
PeerURLs: cfg.APUrls, PeerURLs: cfg.APUrls,
DataDir: cfg.Dir, DataDir: cfg.Dir,
DedicatedWALDir: cfg.WalDir, DedicatedWALDir: cfg.WalDir,
SnapCount: cfg.SnapCount, SnapshotCount: cfg.SnapshotCount,
MaxSnapFiles: cfg.MaxSnapFiles, MaxSnapFiles: cfg.MaxSnapFiles,
MaxWALFiles: cfg.MaxWalFiles, MaxWALFiles: cfg.MaxWalFiles,
InitialPeerURLsMap: urlsmap, InitialPeerURLsMap: urlsmap,