From 59dd78dde8883efd1d8c5d6e2e1a7a4876d0a222 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <leegyuho@amazon.com>
Date: Mon, 8 Oct 2018 00:47:51 -0700
Subject: [PATCH] etcdserver: clear message in cluster version decision

Only leader can decide cluster version.
Clarify the logging that this local node is the leader.

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
---
 etcdserver/cluster_util.go | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go
index 6166ac261..eecb890e6 100644
--- a/etcdserver/cluster_util.go
+++ b/etcdserver/cluster_util.go
@@ -163,7 +163,7 @@ func getVersions(lg *zap.Logger, cl *membership.RaftCluster, local types.ID, rt
 		ver, err := getVersion(lg, m, rt)
 		if err != nil {
 			if lg != nil {
-				lg.Warn("failed to get version", zap.String("remote-peer-id", m.ID.String()), zap.Error(err))
+				lg.Warn("failed to get version", zap.String("remote-member-id", m.ID.String()), zap.Error(err))
 			} else {
 				plog.Warningf("cannot get the version of member %s (%v)", m.ID, err)
 			}
@@ -191,8 +191,8 @@ func decideClusterVersion(lg *zap.Logger, vers map[string]*version.Versions) *se
 			if lg != nil {
 				lg.Warn(
 					"failed to parse server version of remote member",
-					zap.String("remote-peer-id", mid),
-					zap.String("remote-peer-version", ver.Server),
+					zap.String("remote-member-id", mid),
+					zap.String("remote-member-version", ver.Server),
 					zap.Error(err),
 				)
 			} else {
@@ -203,10 +203,10 @@ func decideClusterVersion(lg *zap.Logger, vers map[string]*version.Versions) *se
 		if lv.LessThan(*v) {
 			if lg != nil {
 				lg.Warn(
-					"local etcd version is not up-to-date",
+					"leader found higher-versioned member",
 					zap.String("local-member-version", lv.String()),
-					zap.String("remote-peer-id", mid),
-					zap.String("remote-peer-version", ver.Server),
+					zap.String("remote-member-id", mid),
+					zap.String("remote-member-version", ver.Server),
 				)
 			} else {
 				plog.Warningf("the local etcd version %s is not up-to-date", lv.String())
@@ -254,8 +254,8 @@ func isCompatibleWithVers(lg *zap.Logger, vers map[string]*version.Versions, loc
 			if lg != nil {
 				lg.Warn(
 					"failed to parse cluster version of remote member",
-					zap.String("remote-peer-id", id),
-					zap.String("remote-peer-cluster-version", v.Cluster),
+					zap.String("remote-member-id", id),
+					zap.String("remote-member-cluster-version", v.Cluster),
 					zap.Error(err),
 				)
 			} else {
@@ -267,8 +267,8 @@ func isCompatibleWithVers(lg *zap.Logger, vers map[string]*version.Versions, loc
 			if lg != nil {
 				lg.Warn(
 					"cluster version of remote member is not compatible; too low",
-					zap.String("remote-peer-id", id),
-					zap.String("remote-peer-cluster-version", clusterv.String()),
+					zap.String("remote-member-id", id),
+					zap.String("remote-member-cluster-version", clusterv.String()),
 					zap.String("minimum-cluster-version-supported", minV.String()),
 				)
 			} else {
@@ -280,8 +280,8 @@ func isCompatibleWithVers(lg *zap.Logger, vers map[string]*version.Versions, loc
 			if lg != nil {
 				lg.Warn(
 					"cluster version of remote member is not compatible; too high",
-					zap.String("remote-peer-id", id),
-					zap.String("remote-peer-cluster-version", clusterv.String()),
+					zap.String("remote-member-id", id),
+					zap.String("remote-member-cluster-version", clusterv.String()),
 					zap.String("minimum-cluster-version-supported", minV.String()),
 				)
 			} else {
@@ -313,7 +313,7 @@ func getVersion(lg *zap.Logger, m *membership.Member, rt http.RoundTripper) (*ve
 				lg.Warn(
 					"failed to reach the peer URL",
 					zap.String("address", addr),
-					zap.String("remote-peer-id", m.ID.String()),
+					zap.String("remote-member-id", m.ID.String()),
 					zap.Error(err),
 				)
 			} else {
@@ -329,7 +329,7 @@ func getVersion(lg *zap.Logger, m *membership.Member, rt http.RoundTripper) (*ve
 				lg.Warn(
 					"failed to read body of response",
 					zap.String("address", addr),
-					zap.String("remote-peer-id", m.ID.String()),
+					zap.String("remote-member-id", m.ID.String()),
 					zap.Error(err),
 				)
 			} else {
@@ -343,7 +343,7 @@ func getVersion(lg *zap.Logger, m *membership.Member, rt http.RoundTripper) (*ve
 				lg.Warn(
 					"failed to unmarshal response",
 					zap.String("address", addr),
-					zap.String("remote-peer-id", m.ID.String()),
+					zap.String("remote-member-id", m.ID.String()),
 					zap.Error(err),
 				)
 			} else {