Skip to content

Commit 6563fc7

Browse files
authored
remove retry in odp mode when meet exception (#314)
1 parent 26a5f56 commit 6563fc7

File tree

3 files changed

+12
-60
lines changed

3 files changed

+12
-60
lines changed

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

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -645,21 +645,9 @@ private <T> T execute(String tableName, TableExecuteCallback<T> callback, ObServ
645645
return t;
646646
} catch (Exception ex) {
647647
if (odpMode) {
648-
if ((tryTimes - 1) < runtimeRetryTimes) {
649-
if (ex instanceof ObTableException) {
650-
logger
651-
.warn(
652-
"execute while meet Exception, errorCode: {} , errorMsg: {}, try times {}",
653-
((ObTableException) ex).getErrorCode(), ex.getMessage(),
654-
tryTimes);
655-
} else {
656-
logger.warn("execute while meet Exception, errorMsg: {}, try times {}",
657-
ex.getMessage(), tryTimes);
658-
}
659-
} else {
660-
RUNTIME.error("retry failed with exception", ex);
661-
throw ex;
662-
}
648+
logger.warn("meet exception when execute in odp mode." +
649+
"tablename: {}, errMsg: {}", tableName, ex.getMessage());
650+
throw ex;
663651
} else {
664652
if (ex instanceof ObTableReplicaNotReadableException) {
665653
if (obPair != null && (tryTimes - 1) < runtimeRetryTimes) {
@@ -821,21 +809,9 @@ private <T> T execute(String tableName, OperationExecuteCallback<T> callback,
821809
} catch (Exception ex) {
822810
RUNTIME.error("execute while meet exception", ex);
823811
if (odpMode) {
824-
if ((tryTimes - 1) < runtimeRetryTimes) {
825-
if (ex instanceof ObTableException) {
826-
logger.warn(
827-
"execute while meet Exception, errorCode: {} , errorMsg: {}, try times {}",
828-
((ObTableException) ex).getErrorCode(), ex.getMessage(),
829-
tryTimes);
830-
} else {
831-
logger.warn(
832-
"execute while meet Exception, exception: {}, try times {}", ex,
833-
tryTimes);
834-
}
835-
} else {
836-
RUNTIME.error("retry failed with exception", ex);
837-
throw ex;
838-
}
812+
logger.warn("meet exception when execute in odp mode." +
813+
"tablename: {}, errMsg: {}", tableName, ex.getMessage());
814+
throw ex;
839815
} else {
840816
if (ex instanceof ObTableReplicaNotReadableException) {
841817
if (obPair != null && (tryTimes - 1) < runtimeRetryTimes) {

src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/query/AbstractQueryStreamResult.java

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -182,27 +182,9 @@ protected ObPayload commonExecute(ObTableClient client, Logger logger,
182182
break;
183183
} catch (Exception e) {
184184
if (client.isOdpMode()) {
185-
if ((tryTimes - 1) < client.getRuntimeRetryTimes()) {
186-
if (e instanceof ObTableException) {
187-
logger
188-
.warn(
189-
"tablename:{} stream query execute while meet Exception needing retry, errorCode: {}, errorMsg: {}, try times {}",
190-
indexTableName, ((ObTableException) e).getErrorCode(),
191-
e.getMessage(), tryTimes);
192-
} else if (e instanceof IllegalArgumentException) {
193-
logger
194-
.warn(
195-
"tablename:{} stream query execute while meet Exception needing retry, try times {}, errorMsg: {}",
196-
indexTableName, tryTimes, e.getMessage());
197-
} else {
198-
logger
199-
.warn(
200-
"tablename:{} stream query execute while meet Exception needing retry, try times {}",
201-
indexTableName, tryTimes, e);
202-
}
203-
} else {
204-
throw e;
205-
}
185+
logger.warn("meet exception when execute in odp mode." +
186+
"tablename: {}, errMsg: {}", indexTableName, e.getMessage());
187+
throw e;
206188
} else {
207189
if (e instanceof ObTableReplicaNotReadableException) {
208190
if ((tryTimes - 1) < client.getRuntimeRetryTimes()) {

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -390,15 +390,9 @@ public void partitionExecute(ObTableOperationResult[] results,
390390
break;
391391
} catch (Exception ex) {
392392
if (obTableClient.isOdpMode()) {
393-
if ((tryTimes - 1) < obTableClient.getRuntimeRetryTimes()) {
394-
logger
395-
.warn(
396-
"batch ops execute while meet Exception, tablename:{}, errorMsg: {}, try times {}",
397-
tableName, ex.getMessage(),
398-
tryTimes);
399-
} else {
400-
throw ex;
401-
}
393+
logger.warn("meet exception when execute batch in odp mode." +
394+
"tablename: {}, errMsg: {}", tableName, ex.getMessage());
395+
throw ex;
402396
} else if (ex instanceof ObTableReplicaNotReadableException) {
403397
if ((tryTimes - 1) < obTableClient.getRuntimeRetryTimes()) {
404398
logger.warn(

0 commit comments

Comments
 (0)