From b2aff4efaaf98bc8e401171d7a7f4db8e9b2c507 Mon Sep 17 00:00:00 2001
From: zhaoliwei <zhaoliwei@xiaomi.com>
Date: Mon, 13 Jan 2020 18:33:59 +0800
Subject: [PATCH 1/2] delete unused log

---
 .../infra/pegasus/rpc/async/TableHandler.java | 65 +++----------------
 1 file changed, 8 insertions(+), 57 deletions(-)

diff --git a/src/main/java/com/xiaomi/infra/pegasus/rpc/async/TableHandler.java b/src/main/java/com/xiaomi/infra/pegasus/rpc/async/TableHandler.java
index c09b01ee..c39adf58 100644
--- a/src/main/java/com/xiaomi/infra/pegasus/rpc/async/TableHandler.java
+++ b/src/main/java/com/xiaomi/infra/pegasus/rpc/async/TableHandler.java
@@ -107,68 +107,21 @@ public ReplicaConfiguration getReplicaConfig(int index) {
   // update the table configuration & appID_ according to to queried response
   void initTableConfiguration(query_cfg_response resp) {
     TableConfiguration oldConfig = tableConfig_.get();
-    TableConfiguration newConfig = new TableConfiguration();
 
+    TableConfiguration newConfig = new TableConfiguration();
     newConfig.updateVersion = (oldConfig == null) ? 1 : (oldConfig.updateVersion + 1);
-    newConfig.replicas = new ArrayList<ReplicaConfiguration>(resp.getPartition_count());
-
-    boolean noticeOld = false;
-    if (appID_ == resp.getApp_id()
-        && oldConfig != null
-        && oldConfig.replicas.size() == resp.getPartition_count()) {
-      noticeOld = true;
-      logger.info(
-          "{}: take care and compare the old configuration from the new one when update config",
-          tableName_);
-    } else {
-      logger.info("{}: skip the old config in current table", tableName_);
-    }
-
+    newConfig.replicas = new ArrayList<>(resp.getPartition_count());
     for (int i = 0; i != resp.getPartition_count(); ++i) {
       ReplicaConfiguration newReplicaConfig = new ReplicaConfiguration();
       newReplicaConfig.pid.set_app_id(resp.getApp_id());
       newReplicaConfig.pid.set_pidx(i);
-
-      if (noticeOld) {
-        ReplicaConfiguration oldReplicaConfig = oldConfig.replicas.get(i);
-        newReplicaConfig.ballot = oldReplicaConfig.ballot;
-        newReplicaConfig.primary = oldReplicaConfig.primary;
-        newReplicaConfig.session = oldReplicaConfig.session;
-      }
       newConfig.replicas.add(newReplicaConfig);
     }
 
+    // set partition configuration by resp, and create sessions
     FutureGroup<Void> futureGroup = new FutureGroup<>(resp.getPartition_count());
     for (partition_configuration pc : resp.getPartitions()) {
       ReplicaConfiguration s = newConfig.replicas.get(pc.getPid().get_pidx());
-      if (s.ballot != pc.ballot) {
-        if (!s.primary.equals(pc.primary)) {
-          logger.info(
-              "{}: gpid({}) ballot: {} -> {}, primary: {} -> {}",
-              tableName_,
-              pc.getPid().toString(),
-              s.ballot,
-              pc.ballot,
-              s.primary,
-              pc.primary);
-        } else {
-          logger.info(
-              "{}: gpid({}) ballot: {} -> {}, primary: {}",
-              tableName_,
-              pc.getPid().toString(),
-              s.ballot,
-              pc.ballot,
-              pc.primary);
-        }
-      } else {
-        logger.info(
-            "{}: gpid({}) ballot: {}, primary: {}",
-            tableName_,
-            pc.getPid().toString(),
-            pc.ballot,
-            pc.primary);
-      }
-
       s.ballot = pc.ballot;
       s.primary = pc.primary;
       if (pc.primary.isInvalid()) {
@@ -185,17 +138,15 @@ void initTableConfiguration(query_cfg_response resp) {
       }
     }
 
-    // there should only be one thread to do the table config update
-    appID_ = resp.getApp_id();
-    tableConfig_.set(newConfig);
-
-    // Warm up the connections during client.openTable, so RPCs thereafter can
-    // skip the connect process.
     try {
       futureGroup.waitAllCompleteOrOneFail(manager_.getTimeout());
     } catch (PException e) {
-      logger.warn("failed to connect with some replica servers!");
+      logger.warn("failed to connect with some replica servers!", e);
     }
+
+    // there should only be one thread to do the table config update
+    appID_ = resp.getApp_id();
+    tableConfig_.set(newConfig);
   }
 
   void onUpdateConfiguration(final query_cfg_operator op) {

From 25d5187f7d5fd4c5e8625180f3d6dbc25af35d31 Mon Sep 17 00:00:00 2001
From: levy5307 <zlw5307@163.com>
Date: Wed, 12 Feb 2020 12:38:05 +0800
Subject: [PATCH 2/2] fix

---
 .../java/com/xiaomi/infra/pegasus/rpc/async/TableHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xiaomi/infra/pegasus/rpc/async/TableHandler.java b/src/main/java/com/xiaomi/infra/pegasus/rpc/async/TableHandler.java
index c39adf58..5bfa9880 100644
--- a/src/main/java/com/xiaomi/infra/pegasus/rpc/async/TableHandler.java
+++ b/src/main/java/com/xiaomi/infra/pegasus/rpc/async/TableHandler.java
@@ -138,10 +138,12 @@ void initTableConfiguration(query_cfg_response resp) {
       }
     }
 
+    // Warm up the connections during client.openTable, so RPCs thereafter can
+    // skip the connect process.
     try {
       futureGroup.waitAllCompleteOrOneFail(manager_.getTimeout());
     } catch (PException e) {
-      logger.warn("failed to connect with some replica servers!", e);
+      logger.warn("failed to connect with some replica servers: ", e);
     }
 
     // there should only be one thread to do the table config update