Skip to content

Commit 828032e

Browse files
committed
add new rerouting errorcode
1 parent e555a80 commit 828032e

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -789,10 +789,8 @@ public void calculateContinuousFailure(String tableName, String errorMsg) throws
789789
}
790790

791791
public void resetContinuousFailureByTableName(String tableName) {
792-
tableContinuousFailures.computeIfPresent(tableName, (k, v) -> {
793-
v.set(0);
794-
return v;
795-
});
792+
AtomicLong res = tableContinuousFailures.get(tableName);
793+
res.set(0);
796794
}
797795

798796
/**

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,11 @@ protected InvokeFuture createInvokeFuture(Connection conn, RemotingCommand reque
174174

175175
private boolean needFetchAll(int errorCode) {
176176
return errorCode == ResultCodes.OB_PARTITION_NOT_EXIST.errorCode
177-
|| errorCode == ResultCodes.OB_INVALID_PARTITION.errorCode
178-
|| errorCode == ResultCodes.OB_UNKNOWN_PARTITION.errorCode
179-
|| errorCode == ResultCodes.OB_PARTITION_NOT_MATCH.errorCode
180-
|| errorCode == ResultCodes.OB_TABLET_NOT_EXIST.errorCode;
177+
|| errorCode == ResultCodes.OB_INVALID_PARTITION.errorCode
178+
|| errorCode == ResultCodes.OB_UNKNOWN_PARTITION.errorCode
179+
|| errorCode == ResultCodes.OB_PARTITION_NOT_MATCH.errorCode
180+
|| errorCode == ResultCodes.OB_TABLET_NOT_EXIST.errorCode
181+
|| errorCode == ResultCodes.OB_REPLICA_NOT_READABLE.errorCode
182+
|| errorCode == ResultCodes.OB_SCHEMA_EAGAIN.errorCode;
181183
}
182184
}

src/main/java/com/alipay/oceanbase/rpc/protocol/payload/ResultCodes.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ public enum ResultCodes {
633633
OB_IGNORE_SQL_IN_RESTORE(-5309), //
634634
OB_ERR_UNEXPECTED_TZ_TRANSITION(-5310), //
635635
OB_ERR_INVALID_COLUMN_ID(-5311), //
636+
OB_SCHEMA_EAGAIN(-5627), //
636637
OB_TRANSACTION_SET_VIOLATION(-6001), //
637638
OB_TRANS_ROLLBACKED(-6002), //
638639
OB_ERR_EXCLUSIVE_LOCK_CONFLICT(-6003), //

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,6 @@ public void partitionExecute(ObTableOperationResult[] results,
383383
tableName, partId, ((ObTableException) ex).getErrorCode(),
384384
tryTimes, ex);
385385
if (ex instanceof ObTableRoutingWrongException) {
386-
System.out.println("need fetchAll refresh");
387386
obTableClient.getOrRefreshTableEntry(tableName, true, obTableClient.isTableEntryRefreshIntervalWait(), true);
388387
// reset failure count while fetch all route info
389388
obTableClient.resetContinuousFailureByTableName(tableName);

0 commit comments

Comments
 (0)