From 1fec4ba127aa7d9ae151c33e73c4d316b37ee4fc Mon Sep 17 00:00:00 2001 From: sharat Date: Sat, 13 Aug 2016 06:17:21 +0530 Subject: [PATCH] etcdserver: optimized veryfying local member moved the code for perparing and sorting of advertising peer urls and sorting of peer urls only when strict verification needs to be done. This is done to avoid this processing when strict verification is not required like in case of VerifyJoinExisting function. #6165 --- etcdserver/config.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etcdserver/config.go b/etcdserver/config.go index b66a63323..bdfa4bacb 100644 --- a/etcdserver/config.go +++ b/etcdserver/config.go @@ -104,11 +104,11 @@ func (c *ServerConfig) verifyLocalMember(strict bool) error { return fmt.Errorf("couldn't find local name %q in the initial cluster configuration", c.Name) } - // Advertised peer URLs must match those in the cluster peer list - apurls := c.PeerURLs.StringSlice() - sort.Strings(apurls) - urls.Sort() if strict { + // Advertised peer URLs must match those in the cluster peer list + apurls := c.PeerURLs.StringSlice() + sort.Strings(apurls) + urls.Sort() if !netutil.URLStringsEqual(apurls, urls.StringSlice()) { umap := map[string]types.URLs{c.Name: c.PeerURLs} return fmt.Errorf("--initial-cluster must include %s given --initial-advertise-peer-urls=%s", types.URLsMap(umap).String(), strings.Join(apurls, ","))