Skip to content

remove retry in odp mode when meet exception #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GroundWu merged 1 commit into from
Apr 2, 2025
Merged

remove retry in odp mode when meet exception #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 6 additions & 30 deletions src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,21 +645,9 @@ private <T> T execute(String tableName, TableExecuteCallback<T> callback, ObServ
return t;
} catch (Exception ex) {
if (odpMode) {
if ((tryTimes - 1) < runtimeRetryTimes) {
if (ex instanceof ObTableException) {
logger
.warn(
"execute while meet Exception, errorCode: {} , errorMsg: {}, try times {}",
((ObTableException) ex).getErrorCode(), ex.getMessage(),
tryTimes);
} else {
logger.warn("execute while meet Exception, errorMsg: {}, try times {}",
ex.getMessage(), tryTimes);
}
} else {
RUNTIME.error("retry failed with exception", ex);
throw ex;
}
logger.warn("meet exception when execute in odp mode." +
"tablename: {}, errMsg: {}", tableName, ex.getMessage());
throw ex;
} else {
if (ex instanceof ObTableReplicaNotReadableException) {
if (obPair != null && (tryTimes - 1) < runtimeRetryTimes) {
Expand Down Expand Up @@ -821,21 +809,9 @@ private <T> T execute(String tableName, OperationExecuteCallback<T> callback,
} catch (Exception ex) {
RUNTIME.error("execute while meet exception", ex);
if (odpMode) {
if ((tryTimes - 1) < runtimeRetryTimes) {
if (ex instanceof ObTableException) {
logger.warn(
"execute while meet Exception, errorCode: {} , errorMsg: {}, try times {}",
((ObTableException) ex).getErrorCode(), ex.getMessage(),
tryTimes);
} else {
logger.warn(
"execute while meet Exception, exception: {}, try times {}", ex,
tryTimes);
}
} else {
RUNTIME.error("retry failed with exception", ex);
throw ex;
}
logger.warn("meet exception when execute in odp mode." +
"tablename: {}, errMsg: {}", tableName, ex.getMessage());
throw ex;
} else {
if (ex instanceof ObTableReplicaNotReadableException) {
if (obPair != null && (tryTimes - 1) < runtimeRetryTimes) {
Expand Down
24 changes: 3 additions & 21 deletions ...m/alipay/oceanbase/rpc/protocol/payload/impl/execute/query/AbstractQueryStreamResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,27 +182,9 @@ protected ObPayload commonExecute(ObTableClient client, Logger logger,
break;
} catch (Exception e) {
if (client.isOdpMode()) {
if ((tryTimes - 1) < client.getRuntimeRetryTimes()) {
if (e instanceof ObTableException) {
logger
.warn(
"tablename:{} stream query execute while meet Exception needing retry, errorCode: {}, errorMsg: {}, try times {}",
indexTableName, ((ObTableException) e).getErrorCode(),
e.getMessage(), tryTimes);
} else if (e instanceof IllegalArgumentException) {
logger
.warn(
"tablename:{} stream query execute while meet Exception needing retry, try times {}, errorMsg: {}",
indexTableName, tryTimes, e.getMessage());
} else {
logger
.warn(
"tablename:{} stream query execute while meet Exception needing retry, try times {}",
indexTableName, tryTimes, e);
}
} else {
throw e;
}
logger.warn("meet exception when execute in odp mode." +
"tablename: {}, errMsg: {}", indexTableName, e.getMessage());
throw e;
} else {
if (e instanceof ObTableReplicaNotReadableException) {
if ((tryTimes - 1) < client.getRuntimeRetryTimes()) {
Expand Down
12 changes: 3 additions & 9 deletions src/main/java/com/alipay/oceanbase/rpc/table/ObTableClientBatchOpsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,15 +390,9 @@ public void partitionExecute(ObTableOperationResult[] results,
break;
} catch (Exception ex) {
if (obTableClient.isOdpMode()) {
if ((tryTimes - 1) < obTableClient.getRuntimeRetryTimes()) {
logger
.warn(
"batch ops execute while meet Exception, tablename:{}, errorMsg: {}, try times {}",
tableName, ex.getMessage(),
tryTimes);
} else {
throw ex;
}
logger.warn("meet exception when execute batch in odp mode." +
"tablename: {}, errMsg: {}", tableName, ex.getMessage());
throw ex;
} else if (ex instanceof ObTableReplicaNotReadableException) {
if ((tryTimes - 1) < obTableClient.getRuntimeRetryTimes()) {
logger.warn(
Expand Down