etcdmain: fix that advertise-client-urls is required in proxy mode

yichengq · yichengq · commit 6fd2dfdebcca · 2015-06-16T14:18:01.000-07:00
etcd proxy doesn't need to set advertise-client-urls because the flag is
not used.
diff --git a/etcdmain/config.go b/etcdmain/config.go
@@ -258,8 +258,12 @@ func (cfg *config) Parse(arguments []string) error {
 	if err != nil {
 		return err
 	}
-	if flags.IsSet(cfg.FlagSet, "listen-client-urls") && !flags.IsSet(cfg.FlagSet, "advertise-client-urls") {
-		return errUnsetAdvertiseClientURLsFlag
+
+	// when etcd runs in member mode user needs to set -advertise-client-urls if -listen-client-urls is set.
+	if cfg.proxy.String() != proxyFlagOn {
+		if flags.IsSet(cfg.FlagSet, "listen-client-urls") && !flags.IsSet(cfg.FlagSet, "advertise-client-urls") {
+			return errUnsetAdvertiseClientURLsFlag
+		}
 	}
 
 	if 5*cfg.TickMs > cfg.ElectionMs {

Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,12 @@ func (cfg *config) Parse(arguments []string) error {`
`258`	`258`	`if err != nil {`
`259`	`259`	`return err`
`260`	`260`	`}`
`261`		`- if flags.IsSet(cfg.FlagSet, "listen-client-urls") && !flags.IsSet(cfg.FlagSet, "advertise-client-urls") {`
`262`		`- return errUnsetAdvertiseClientURLsFlag`
	`261`	`+`
	`262`	`+ // when etcd runs in member mode user needs to set -advertise-client-urls if -listen-client-urls is set.`
	`263`	`+ if cfg.proxy.String() != proxyFlagOn {`
	`264`	`+ if flags.IsSet(cfg.FlagSet, "listen-client-urls") && !flags.IsSet(cfg.FlagSet, "advertise-client-urls") {`
	`265`	`+ return errUnsetAdvertiseClientURLsFlag`
	`266`	`+ }`
`263`	`267`	`}`
`264`	`268`
`265`	`269`	`if 5*cfg.TickMs > cfg.ElectionMs {`