Skip to content

Fix performance not recovery after disaster recovery #288

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
WeiXinChan merged 2 commits into from
Sep 15, 2025
Merged

Fix performance not recovery after disaster recovery #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c08a2c8
add NeedTabletId flag
JackShi148 Sep 3, 2025
96624ad
fix getscanners bug
JackShi148 Sep 10, 2025
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
6 changes: 6 additions & 0 deletions src/main/java/com/alipay/oceanbase/hbase/OHTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,6 +1152,7 @@ public List<ResultScanner> call() throws IOException {

request = buildObTableQueryAsyncRequest(obTableQuery,
getTargetTableName(tableNameString));
request.setNeedTabletId(false);
request.setAllowDistributeScan(false);
String phyTableName = obTableClient.getPhyTableNameFromTableGroup(
request.getObTableQueryRequest(), tableNameString);
Expand Down Expand Up @@ -1188,6 +1189,7 @@ public List<ResultScanner> call() throws IOException {
String targetTableName = getTargetTableName(tableNameString, Bytes.toString(family),
configuration);
request = buildObTableQueryAsyncRequest(obTableQuery, targetTableName);
request.setNeedTabletId(false);
request.setAllowDistributeScan(false);
List<Partition> partitions = obTableClient
.getPartition(targetTableName, false);
Expand Down Expand Up @@ -2373,6 +2375,7 @@ private BatchOperation buildBatchOperation(String tableName, List<? extends Row>
}
batch.setEntityType(ObTableEntityType.HKV);
batch.setServerCanRetry(OHBaseFuncUtils.serverCanRetry(obTableClient));
batch.setNeedTabletId(OHBaseFuncUtils.needTabletId(obTableClient));
return batch;
}

Expand Down Expand Up @@ -2478,6 +2481,7 @@ private ObTableQueryRequest buildObTableQueryRequest(ObTableQuery obTableQuery,
request.setTableQuery(obTableQuery);
request.setTableName(targetTableName);
request.setServerCanRetry(OHBaseFuncUtils.serverCanRetry(obTableClient));
request.setNeedTabletId(OHBaseFuncUtils.needTabletId(obTableClient));
return request;
}

Expand All @@ -2492,6 +2496,7 @@ private ObTableQueryAsyncRequest buildObTableQueryAsyncRequest(ObTableQuery obTa
asyncRequest.setTableName(targetTableName);
asyncRequest.setObTableQueryRequest(request);
asyncRequest.setServerCanRetry(OHBaseFuncUtils.serverCanRetry(obTableClient));
asyncRequest.setNeedTabletId(OHBaseFuncUtils.needTabletId(obTableClient));
return asyncRequest;
}

Expand All @@ -2507,6 +2512,7 @@ private ObTableQueryAndMutateRequest buildObTableQueryAndMutateRequest(ObTableQu
request.setEntityType(ObTableEntityType.HKV);
request.setReturningAffectedEntity(true);
request.setServerCanRetry(OHBaseFuncUtils.serverCanRetry(obTableClient));
request.setNeedTabletId(OHBaseFuncUtils.needTabletId(obTableClient));
return request;
}

Expand Down
11 changes: 11 additions & 0 deletions src/main/java/com/alipay/oceanbase/hbase/util/OHBaseFuncUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,15 @@ public static boolean serverCanRetry(ObTableClient tableClient) {
return true;
}
}

public static boolean needTabletId(ObTableClient tableClient) {
if (tableClient.isOdpMode()) {
return ObGlobal.isDistributeNeedTabletIdSupport()
&& ObGlobal.OB_PROXY_VERSION >= ObGlobal.OB_PROXY_VERSION_4_3_6_0
&& tableClient.getServerCapacity().isSupportDistributedExecute();
} else {
return ObGlobal.isDistributeNeedTabletIdSupport()
&& tableClient.getServerCapacity().isSupportDistributedExecute();
}
}
}