add -4138

Author: maochongxin

src/main/java/com/alipay/oceanbase/rpc/bolt/transport/ObTableRemoting.java

@@ -31,8 +31,6 @@
 import io.netty.buffer.ByteBuf;
 import org.slf4j.Logger;
 
-import javax.xml.transform.Result;
-
 import static com.alipay.oceanbase.rpc.protocol.packet.ObCompressType.INVALID_COMPRESSOR;
 import static com.alipay.oceanbase.rpc.protocol.packet.ObCompressType.NONE_COMPRESSOR;
 
@@ -124,7 +122,7 @@ public ObPayload invokeSync(final ObTableConnection conn, final ObPayload reques
             ObRpcResultCode resultCode = new ObRpcResultCode();
             resultCode.decode(buf);
             // If response indicates the request is routed to wrong server, we should refresh the routing meta.
-            if (!conn.getObTable().getReRouting() && response.getHeader().isRoutingWrong()) {
+            if (!conn.getObTable().isEnableRerouting() && response.getHeader().isRoutingWrong()) {
                 String errMessage = TraceUtil.formatTraceMessage(conn, request,
                     "routed to the wrong server: " + response.getMessage());
                 logger.warn(errMessage);
@@ -197,6 +195,7 @@ private boolean needFetchAll(int errorCode, int pcode) {
                || errorCode == ResultCodes.OB_TABLET_NOT_EXIST.errorCode
                || errorCode == ResultCodes.OB_LS_NOT_EXIST.errorCode
                || errorCode == ResultCodes.OB_MAPPING_BETWEEN_TABLET_AND_LS_NOT_EXIST.errorCode
+               || errorCode == ResultCodes.OB_SNAPSHOT_DISCARDED.errorCode
                || (pcode == Pcodes.OB_TABLE_API_LS_EXECUTE && errorCode == ResultCodes.OB_NOT_MASTER.errorCode);
     }
 

src/main/java/com/alipay/oceanbase/rpc/property/Property.java

@@ -134,7 +134,7 @@ public enum Property {
     NETTY_BLOCKING_WAIT_INTERVAL("bolt.netty.blocking.wait.interval", 1, "netty写缓存满后等待时间"),
 
     // [ObTable][OTHERS]
-    SERVER_ENABLE_REROUTING("server.enable.rerouting", true, "开启server端的重定向回复功能"),
+    SERVER_ENABLE_REROUTING("server.enable.rerouting", false, "开启server端的重定向回复功能"),
 
     /*
      * other config

src/main/java/com/alipay/oceanbase/rpc/table/ObTable.java

@@ -66,7 +66,7 @@ public class ObTable extends AbstractObTable implements Lifecycle {
 
     private volatile boolean      initialized = false;
     private volatile boolean      closed      = false;
-    private boolean               reRouting   = true;              // only used for init packet factory
+    private boolean enableRerouting = true;              // only used for init packet factory
 
     private ReentrantLock         statusLock  = new ReentrantLock();
 
@@ -89,7 +89,7 @@ public void init() throws Exception {
                 .configWriteBufferWaterMark(getNettyBufferLowWatermark(),
                     getNettyBufferHighWatermark()).build();
             connectionFactory.init(new ConnectionEventHandler(new GlobalSwitch())); // Only for monitoring connection status
-            realClient = new ObTableRemoting(new ObPacketFactory(reRouting));
+            realClient = new ObTableRemoting(new ObPacketFactory(enableRerouting));
             connectionPool = new ObTableConnectionPool(this, obTableConnectionPoolSize);
             connectionPool.init();
             initialized = true;
@@ -164,7 +164,7 @@ private void initProperties() {
             nettyBufferHighWatermark);
         nettyBlockingWaitInterval = parseToInt(NETTY_BLOCKING_WAIT_INTERVAL.getKey(),
             nettyBlockingWaitInterval);
-        reRouting = parseToBoolean(SERVER_ENABLE_REROUTING.getKey(), reRouting);
+        enableRerouting = parseToBoolean(SERVER_ENABLE_REROUTING.getKey(), enableRerouting);
         maxConnExpiredTime = parseToLong(MAX_CONN_EXPIRED_TIME.getKey(), maxConnExpiredTime);
 
         Object value = this.configs.get("runtime");
@@ -174,8 +174,8 @@ private void initProperties() {
         }
     }
 
-    public boolean getReRouting(){
-        return reRouting;
+    public boolean isEnableRerouting(){
+        return enableRerouting;
     }
 
     /*