From bce708d38de6c3dfd00870f57975f143e90ae484 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Thu, 18 Nov 2021 12:45:11 +0800 Subject: [PATCH 1/2] update error log Signed-off-by: marsishandsome --- src/main/java/org/tikv/common/PDClient.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java index 3fc42f41fd1..72b2e899635 100644 --- a/src/main/java/org/tikv/common/PDClient.java +++ b/src/main/java/org/tikv/common/PDClient.java @@ -368,7 +368,7 @@ private synchronized boolean createLeaderClientWrapper(String leaderUrlStr) { new PDClientWrapper(leaderUrlStr, leaderUrlStr, clientChannel, System.nanoTime()); timeout = conf.getTimeout(); } catch (IllegalArgumentException e) { - logger.error("Error updating leader. " + leaderUrlStr, e); + logger.warn("Error updating leader. " + leaderUrlStr, e); return false; } logger.info(String.format("Switched to new leader: %s", pdClientWrapper)); @@ -388,7 +388,7 @@ synchronized boolean createFollowerClientWrapper(String followerUrlStr, String l pdClientWrapper = new PDClientWrapper(leaderUrls, followerUrlStr, channel, System.nanoTime()); timeout = conf.getForwardTimeout(); } catch (IllegalArgumentException e) { - logger.error("Error updating follower. " + followerUrlStr, e); + logger.warn("Error updating follower. " + followerUrlStr, e); return false; } logger.info(String.format("Switched to new leader by follower forward: %s", pdClientWrapper)); @@ -591,8 +591,11 @@ private void initCluster() { if (resp != null) { break; } - logger.error("Could not get leader member with pd: " + u); } + if (resp == null) { + logger.error("Could not get leader member with: " + pdAddrs); + } + this.timeout = originTimeout; checkNotNull(resp, "Failed to init client for PD cluster."); long clusterId = resp.getHeader().getClusterId(); From 763cef97d20d8d0a3f7f47a8c7cebd80a6a8f7f6 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Thu, 18 Nov 2021 16:19:47 +0800 Subject: [PATCH 2/2] address code review Signed-off-by: marsishandsome --- src/main/java/org/tikv/common/PDClient.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java index 72b2e899635..24125f17d6c 100644 --- a/src/main/java/org/tikv/common/PDClient.java +++ b/src/main/java/org/tikv/common/PDClient.java @@ -368,7 +368,6 @@ private synchronized boolean createLeaderClientWrapper(String leaderUrlStr) { new PDClientWrapper(leaderUrlStr, leaderUrlStr, clientChannel, System.nanoTime()); timeout = conf.getTimeout(); } catch (IllegalArgumentException e) { - logger.warn("Error updating leader. " + leaderUrlStr, e); return false; } logger.info(String.format("Switched to new leader: %s", pdClientWrapper)); @@ -388,7 +387,6 @@ synchronized boolean createFollowerClientWrapper(String followerUrlStr, String l pdClientWrapper = new PDClientWrapper(leaderUrls, followerUrlStr, channel, System.nanoTime()); timeout = conf.getForwardTimeout(); } catch (IllegalArgumentException e) { - logger.warn("Error updating follower. " + followerUrlStr, e); return false; } logger.info(String.format("Switched to new leader by follower forward: %s", pdClientWrapper));