From 7c42f0b7f719ee5f2cc5a9120d670fff10a904b9 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Tue, 16 Nov 2021 16:43:59 +0800 Subject: [PATCH 1/2] add log for init TiSession Signed-off-by: marsishandsome --- src/main/java/org/tikv/common/PDClient.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java index b639a4b9519..c38a7dda6a6 100644 --- a/src/main/java/org/tikv/common/PDClient.java +++ b/src/main/java/org/tikv/common/PDClient.java @@ -340,7 +340,7 @@ private GetMembersResponse getMembers(URI uri) { } return resp; } catch (Exception e) { - logger.error("failed to get member from pd server.", e); + logger.warn("failed to get member from pd server.", e); } return null; } @@ -560,6 +560,7 @@ protected PDStub getAsyncStub() { } private void initCluster() { + logger.info("init cluster: start"); GetMembersResponse resp = null; List pdAddrs = new ArrayList<>(getConf().getPdAddrs()); // shuffle PD addresses so that clients call getMembers from different PD @@ -575,14 +576,18 @@ private void initCluster() { .setDaemon(true) .build())) .build(); + logger.info("init host mapping: start"); this.hostMapping = Optional.ofNullable(getConf().getHostMapping()) .orElseGet(() -> new DefaultHostMapping(this.etcdClient, conf.getNetworkMappingName())); + logger.info("init host mapping: end"); // The first request may cost too much latency long originTimeout = this.timeout; this.timeout = 2000; for (URI u : pdAddrs) { + logger.info("get members: start"); resp = getMembers(u); + logger.info("get members: end"); if (resp != null) { break; } @@ -603,7 +608,9 @@ private void initCluster() { String leaderUrlStr = resp.getLeader().getClientUrls(0); leaderUrlStr = uriToAddr(addrToUri(leaderUrlStr)); + logger.info("createLeaderClientWrapper: start"); createLeaderClientWrapper(leaderUrlStr); + logger.info("createLeaderClientWrapper: end"); service = Executors.newSingleThreadScheduledExecutor( new ThreadFactoryBuilder() @@ -630,6 +637,7 @@ private void initCluster() { .build()); tiflashReplicaService.scheduleAtFixedRate( this::updateTiFlashReplicaStatus, 10, 10, TimeUnit.SECONDS); + logger.info("init cluster: finish"); } static class PDClientWrapper { From aba892e59fd6d52a0c970afc9649cf1479e8d86e Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Tue, 16 Nov 2021 17:08:07 +0800 Subject: [PATCH 2/2] address code review Signed-off-by: marsishandsome --- src/main/java/org/tikv/common/PDClient.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java index c38a7dda6a6..3fc42f41fd1 100644 --- a/src/main/java/org/tikv/common/PDClient.java +++ b/src/main/java/org/tikv/common/PDClient.java @@ -585,9 +585,9 @@ private void initCluster() { long originTimeout = this.timeout; this.timeout = 2000; for (URI u : pdAddrs) { - logger.info("get members: start"); + logger.info("get members with pd " + u + ": start"); resp = getMembers(u); - logger.info("get members: end"); + logger.info("get members with pd " + u + ": end"); if (resp != null) { break; } @@ -608,9 +608,9 @@ private void initCluster() { String leaderUrlStr = resp.getLeader().getClientUrls(0); leaderUrlStr = uriToAddr(addrToUri(leaderUrlStr)); - logger.info("createLeaderClientWrapper: start"); + logger.info("createLeaderClientWrapper with leader " + leaderUrlStr + ": start"); createLeaderClientWrapper(leaderUrlStr); - logger.info("createLeaderClientWrapper: end"); + logger.info("createLeaderClientWrapper with leader " + leaderUrlStr + ": end"); service = Executors.newSingleThreadScheduledExecutor( new ThreadFactoryBuilder()