Merge pull request #14420 from vsvastey/usr/vsvastey/nil-logger

etcdserver: nil-logger issue fix for version 3.4
etcd-io · Sep 5, 2022 · 9d5ae56 · 9d5ae56
2 parents 1e26823 + 38342e8
commit 9d5ae56
Showing 1 changed file with 31 additions and 15 deletions.
diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go
@@ -779,11 +779,15 @@ func (s *EtcdServer) requestCurrentIndex(leaderChangedNotifier <-chan struct{},
 				if len(rs.RequestCtx) == 8 {
 					responseId = binary.BigEndian.Uint64(rs.RequestCtx)
 				}
-				lg.Warn(
-					"ignored out-of-date read index response; local node read indexes queueing up and waiting to be in sync with leader",
-					zap.Uint64("sent-request-id", requestId),
-					zap.Uint64("received-request-id", responseId),
-				)
+				if lg != nil {
+					lg.Warn(
+						"ignored out-of-date read index response; local node read indexes queueing up and waiting to be in sync with leader",
+						zap.Uint64("sent-request-id", requestId),
+						zap.Uint64("received-request-id", responseId),
+					)
+				} else {
+					plog.Warningf("ignored out-of-date read index response; local node read indexes queueing up and waiting to be in sync with leader (request ID want %d, got %d)", requestId, responseId)
+				}
 				slowReadIndex.Inc()
 				continue
 			}
@@ -794,30 +798,42 @@ func (s *EtcdServer) requestCurrentIndex(leaderChangedNotifier <-chan struct{},
 			return 0, ErrLeaderChanged
 		case <-firstCommitInTermNotifier:
 			firstCommitInTermNotifier = s.FirstCommitInTermNotify()
-			lg.Info("first commit in current term: resending ReadIndex request")
+			if lg != nil {
+				lg.Info("first commit in current term: resending ReadIndex request")
+			} else {
+				plog.Info("first commit in current term: resending ReadIndex request")
+			}
 			err := s.sendReadIndex(requestId)
 			if err != nil {
 				return 0, err
 			}
 			retryTimer.Reset(readIndexRetryTime)
 			continue
 		case <-retryTimer.C:
-			lg.Warn(
-				"waiting for ReadIndex response took too long, retrying",
-				zap.Uint64("sent-request-id", requestId),
-				zap.Duration("retry-timeout", readIndexRetryTime),
-			)
+			if lg != nil {
+				lg.Warn(
+					"waiting for ReadIndex response took too long, retrying",
+					zap.Uint64("sent-request-id", requestId),
+					zap.Duration("retry-timeout", readIndexRetryTime),
+				)
+			} else {
+				plog.Warningf("waiting for ReadIndex response took too long, retrying (sent-request-id: %d, retry-timeout: %s)", requestId, readIndexRetryTime)
+			}
 			err := s.sendReadIndex(requestId)
 			if err != nil {
 				return 0, err
 			}
 			retryTimer.Reset(readIndexRetryTime)
 			continue
 		case <-errorTimer.C:
-			lg.Warn(
-				"timed out waiting for read index response (local node might have slow network)",
-				zap.Duration("timeout", s.Cfg.ReqTimeout()),
-			)
+			if lg != nil {
+				lg.Warn(
+					"timed out waiting for read index response (local node might have slow network)",
+					zap.Duration("timeout", s.Cfg.ReqTimeout()),
+				)
+			} else {
+				plog.Warningf("timed out waiting for read index response (local node might have slow network) timeout: %s", s.Cfg.ReqTimeout())
+			}
 			slowReadIndex.Inc()
 			return 0, ErrTimeout
 		case <-s.stopping: