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

Merge pull request #5184 from gyuho/typo

Browse Source 
*: fix flag location, minor typo
This commit is contained in:
Gyu-Ho Lee 2016-04-25 09:59:24 -07:00
commit 1378e72bc2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdctl/ctlv3/command/make_mirror_command.go
View File

@ -45,7 +45,7 @@ func NewMakeMirrorCommand() *cobra.Command {
} }
c.Flags().StringVar(&mmprefix, "prefix", "", "the key-value prefix to mirror") c.Flags().StringVar(&mmprefix, "prefix", "", "the key-value prefix to mirror")
// TODO: add dest-prefix to mirror a prefix to a different prefix in the destionation cluster? // TODO: add dest-prefix to mirror a prefix to a different prefix in the destination cluster?
c.Flags().StringVar(&mmcert, "dest-cert", "", "identify secure client using this TLS certificate file for the destination cluster") c.Flags().StringVar(&mmcert, "dest-cert", "", "identify secure client using this TLS certificate file for the destination cluster")
c.Flags().StringVar(&mmkey, "dest-key", "", "identify secure client using this TLS key file") c.Flags().StringVar(&mmkey, "dest-key", "", "identify secure client using this TLS key file")
c.Flags().StringVar(&mmcacert, "dest-cacert", "", "verify certificates of TLS enabled secure servers using this CA bundle") c.Flags().StringVar(&mmcacert, "dest-cacert", "", "verify certificates of TLS enabled secure servers using this CA bundle")
@ -57,7 +57,7 @@ func NewMakeMirrorCommand() *cobra.Command {
func makeMirrorCommandFunc(cmd *cobra.Command, args []string) { func makeMirrorCommandFunc(cmd *cobra.Command, args []string) {
if len(args) != 1 { if len(args) != 1 {
ExitWithError(ExitBadArgs, errors.New("make-mirror takes one destination arguement.")) ExitWithError(ExitBadArgs, errors.New("make-mirror takes one destination argument."))
} }
dialTimeout := dialTimeoutFromCmd(cmd) dialTimeout := dialTimeoutFromCmd(cmd)

4
etcdmain/config.go
View File

@ -89,6 +89,7 @@ type config struct {
// make ticks a cluster wide configuration. // make ticks a cluster wide configuration.
TickMs uint TickMs uint
ElectionMs uint ElectionMs uint
quotaBackendBytes int64
// clustering // clustering
apurls, acurls []url.URL apurls, acurls []url.URL
@ -123,7 +124,6 @@ type config struct {
printVersion bool printVersion bool
autoCompactionRetention int autoCompactionRetention int
quotaBackendBytes int64
enablePprof bool enablePprof bool
@ -167,6 +167,7 @@ func NewConfig() *config {
fs.Uint64Var(&cfg.snapCount, "snapshot-count", etcdserver.DefaultSnapCount, "Number of committed transactions to trigger a snapshot to disk.") fs.Uint64Var(&cfg.snapCount, "snapshot-count", etcdserver.DefaultSnapCount, "Number of committed transactions to trigger a snapshot to disk.")
fs.UintVar(&cfg.TickMs, "heartbeat-interval", 100, "Time (in milliseconds) of a heartbeat interval.") fs.UintVar(&cfg.TickMs, "heartbeat-interval", 100, "Time (in milliseconds) of a heartbeat interval.")
fs.UintVar(&cfg.ElectionMs, "election-timeout", 1000, "Time (in milliseconds) for an election to timeout.") fs.UintVar(&cfg.ElectionMs, "election-timeout", 1000, "Time (in milliseconds) for an election to timeout.")
fs.Int64Var(&cfg.quotaBackendBytes, "quota-backend-bytes", 0, "Raise alarms when backend size exceeds the given quota. 0 means use the default quota.")
// clustering // clustering
fs.Var(flags.NewURLsValue(defaultInitialAdvertisePeerURLs), "initial-advertise-peer-urls", "List of this member's peer URLs to advertise to the rest of the cluster.") fs.Var(flags.NewURLsValue(defaultInitialAdvertisePeerURLs), "initial-advertise-peer-urls", "List of this member's peer URLs to advertise to the rest of the cluster.")
@ -225,7 +226,6 @@ func NewConfig() *config {
// demo flag // demo flag
fs.IntVar(&cfg.autoCompactionRetention, "experimental-auto-compaction-retention", 0, "Auto compaction retention in hour. 0 means disable auto compaction.") fs.IntVar(&cfg.autoCompactionRetention, "experimental-auto-compaction-retention", 0, "Auto compaction retention in hour. 0 means disable auto compaction.")
fs.Int64Var(&cfg.quotaBackendBytes, "quota-backend-bytes", 0, "Raise alarms when backend size exceeds the given quota. 0 means use the default quota.")
// backwards-compatibility with v0.4.6 // backwards-compatibility with v0.4.6
fs.Var(&flags.IPAddressPort{}, "addr", "DEPRECATED: Use --advertise-client-urls instead.") fs.Var(&flags.IPAddressPort{}, "addr", "DEPRECATED: Use --advertise-client-urls instead.")