From 7577a56c1feb57c05ef04a46d8e274e9aa609479 Mon Sep 17 00:00:00 2001 From: adeyemi Date: Fri, 27 Dec 2024 09:42:07 -0800 Subject: [PATCH 1/3] Update misleading warn message when versions mismatch Signed-off-by: adeyemi --- server/etcdserver/api/rafthttp/http.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/etcdserver/api/rafthttp/http.go b/server/etcdserver/api/rafthttp/http.go index 56b2f474132..5111e7281e5 100644 --- a/server/etcdserver/api/rafthttp/http.go +++ b/server/etcdserver/api/rafthttp/http.go @@ -486,7 +486,7 @@ func checkClusterCompatibilityFromHeader(lg *zap.Logger, localID types.ID, heade if err != nil { lg.Warn( - "failed to check version compatibility", + "local and remote versions are incompatible", zap.String("local-member-id", localID.String()), zap.String("local-member-cluster-id", cid.String()), zap.String("local-member-server-version", localVs), From 05ff6333a91e01772d0e4bc32ad0095de7cc2981 Mon Sep 17 00:00:00 2001 From: adeyemi Date: Fri, 27 Dec 2024 21:15:14 -0800 Subject: [PATCH 2/3] Rephrase warn messaging Signed-off-by: adeyemi --- server/etcdserver/api/rafthttp/http.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/etcdserver/api/rafthttp/http.go b/server/etcdserver/api/rafthttp/http.go index 5111e7281e5..76d226198d0 100644 --- a/server/etcdserver/api/rafthttp/http.go +++ b/server/etcdserver/api/rafthttp/http.go @@ -486,7 +486,7 @@ func checkClusterCompatibilityFromHeader(lg *zap.Logger, localID types.ID, heade if err != nil { lg.Warn( - "local and remote versions are incompatible", + "failed version check compatibility", zap.String("local-member-id", localID.String()), zap.String("local-member-cluster-id", cid.String()), zap.String("local-member-server-version", localVs), From a1a9149bbb891e53f09ee26a4ec43e29d6bbcb27 Mon Sep 17 00:00:00 2001 From: adeyemi Date: Wed, 8 Jan 2025 10:54:00 -0800 Subject: [PATCH 3/3] Fix typo in typo fix Signed-off-by: adeyemi --- server/etcdserver/api/rafthttp/http.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/etcdserver/api/rafthttp/http.go b/server/etcdserver/api/rafthttp/http.go index 76d226198d0..2610240e5ac 100644 --- a/server/etcdserver/api/rafthttp/http.go +++ b/server/etcdserver/api/rafthttp/http.go @@ -486,7 +486,7 @@ func checkClusterCompatibilityFromHeader(lg *zap.Logger, localID types.ID, heade if err != nil { lg.Warn( - "failed version check compatibility", + "failed version compatibility check", zap.String("local-member-id", localID.String()), zap.String("local-member-cluster-id", cid.String()), zap.String("local-member-server-version", localVs),