Skip to content

Commit

Permalink
add log for -10500 error (#102)
Browse files Browse the repository at this point in the history 
* add log for -10500 error

* fix: tables with same index name use the same ObIndexinfo
  • Loading branch information
@GroundWu
GroundWu authored Mar 6, 2024
1 parent dac8296 commit fdfe9fb
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 23 deletions.
33 changes: 16 additions & 17 deletions src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -935,22 +935,22 @@ public void syncRefreshMetadata() throws Exception {
* @return the real table name
*/
public String getIndexTableName(final String dataTableName, final String indexName,
List<String> scanRangeColumns) throws Exception {
List<String> scanRangeColumns, boolean forceRefreshIndexInfo) throws Exception {
String indexTableName = dataTableName;
if (indexName != null && !indexName.isEmpty() && !indexName.equalsIgnoreCase("PRIMARY")) {
String tmpTableName = constructIndexTableName(dataTableName, indexName);
if (tmpTableName == null) {
throw new ObTableException("index table name is null");
}
ObIndexInfo indexInfo = getOrRefreshIndexInfo(indexName, tmpTableName);
ObIndexInfo indexInfo = getOrRefreshIndexInfo(tmpTableName, forceRefreshIndexInfo);
if (indexInfo == null) {
throw new ObTableException("index info is null");
throw new ObTableException("index info is null, indexTableName:" + tmpTableName);
}
if (indexInfo.getIndexType().isGlobalIndex()) {
indexTableName = tmpTableName;
if (scanRangeColumns.isEmpty()) {
throw new ObTableException(
"query by global index need add all index keys in order");
"query by global index need add all index keys in order, indexTableName:" + indexTableName);
} else {
addRowKeyElement(indexTableName,
scanRangeColumns.toArray(new String[scanRangeColumns.size()]));
Expand Down Expand Up @@ -982,30 +982,29 @@ public String constructIndexTableName(final String dataTableName, final String i
return "__idx_" + dataTableId + "_" + indexName;
}

public ObIndexInfo getOrRefreshIndexInfo(final String indexName, final String indexTableName)
throws Exception {
ObIndexInfo indexInfo = indexinfos.get(indexName);
if (indexInfo != null) {
public ObIndexInfo getOrRefreshIndexInfo(final String indexTableName, boolean forceRefresh) throws Exception {

ObIndexInfo indexInfo = indexinfos.get(indexTableName);
if (!forceRefresh && indexInfo != null) {
return indexInfo;
}
Lock tempLock = new ReentrantLock();
Lock lock = refreshIndexInfoLocks.putIfAbsent(indexName, tempLock);
Lock lock = refreshIndexInfoLocks.putIfAbsent(indexTableName, tempLock);
lock = (lock == null) ? tempLock : lock;
boolean acquired = lock.tryLock(tableEntryRefreshLockTimeout, TimeUnit.MILLISECONDS);
if (!acquired) {
String errMsg = "try to lock index infos refreshing timeout " + "dataSource:"
+ dataSourceName + " ,indexName:" + indexName + " , timeout:"
+ dataSourceName + " ,indexTableName:" + indexTableName + " , timeout:"
+ tableEntryRefreshLockTimeout + ".";
RUNTIME.error(errMsg);
throw new ObTableEntryRefreshException(errMsg);
}
try {
indexInfo = indexinfos.get(indexName);
if (indexInfo != null) {
indexInfo = indexinfos.get(indexTableName);
if (!forceRefresh && indexInfo != null) {
return indexInfo;
} else {
logger.info("index info is not exist, create new index info, indexName: {}",
indexName);
logger.info("index info is not exist, create new index info, indexTableName: {}", indexTableName);
int serverSize = serverRoster.getMembers().size();
int refreshTryTimes = tableEntryRefreshTryTimes > serverSize ? serverSize
: tableEntryRefreshTryTimes;
Expand All @@ -1016,10 +1015,10 @@ public ObIndexInfo getOrRefreshIndexInfo(final String indexName, final String in
tableEntryAcquireConnectTimeout, tableEntryAcquireSocketTimeout,
indexTableName);
if (indexInfo != null) {
indexinfos.put(indexName, indexInfo);
indexinfos.put(indexTableName, indexInfo);
} else {
RUNTIME.error("get index info from remote is null, index name: {}",
indexName);
RUNTIME.error("get index info from remote is null, indexTableName: {}",
indexTableName);
}
}
return indexInfo;
Expand Down
15 changes: 11 additions & 4 deletions src/main/java/com/alipay/oceanbase/rpc/exception/ExceptionUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.Objects;

import static com.alipay.oceanbase.rpc.protocol.payload.ResultCodes.OB_DESERIALIZE_ERROR;
import static com.alipay.oceanbase.rpc.protocol.payload.ResultCodes.OB_ERR_KV_GLOBAL_INDEX_ROUTE;

public class ExceptionUtil {

Expand Down Expand Up @@ -70,10 +71,16 @@ public static ObTableException convertToObTableException(String host, int port,
errorCode);
}

// [errCode][errCodeName][errMsg][server][trace]
return new ObTableException("[" + String.valueOf(resultCodes.errorCode) + "]" + "["
+ resultCodes.name() + "]" + "[" + errMsg + "]" + "[" + server
+ "]" + "[" + trace + "]", resultCodes.errorCode);
if (resultCodes.errorCode == OB_ERR_KV_GLOBAL_INDEX_ROUTE.errorCode) {
return new ObTableGlobalIndexRouteException("[" + String.valueOf(resultCodes.errorCode) + "]" + "["
+ resultCodes.name() + "]" + "[" + errMsg + "]" + "[" + server
+ "]" + "[" + trace + "]", resultCodes.errorCode);
} else {
// [errCode][errCodeName][errMsg][server][trace]
return new ObTableException("[" + String.valueOf(resultCodes.errorCode) + "]" + "["
+ resultCodes.name() + "]" + "[" + errMsg + "]" + "[" + server
+ "]" + "[" + trace + "]", resultCodes.errorCode);
}
}

/*
Expand Down
69 changes: 69 additions & 0 deletions src/main/java/com/alipay/oceanbase/rpc/exception/ObTableGlobalIndexRouteException.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*-
* #%L
* OBKV Table Client Framework
* %%
* Copyright (C) 2021 OceanBase
* %%
* OBKV Table Client Framework is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
* #L%
*/

package com.alipay.oceanbase.rpc.exception;

public class ObTableGlobalIndexRouteException extends ObTableException {

/*
* Ob table global index route exception.
*/
public ObTableGlobalIndexRouteException() {
}

/*
* Ob table global index route exception.
*/
public ObTableGlobalIndexRouteException(int errorCode) {
super(errorCode);
}

/*
* Ob table global index route exception.
*/
public ObTableGlobalIndexRouteException(String message, int errorCode) {
super(message, errorCode);
}

/*
* Ob table global index route exception.
*/
public ObTableGlobalIndexRouteException(String message) {
super(message);
}

/*
* Ob table global index route exception.
*/
public ObTableGlobalIndexRouteException(String message, Throwable cause) {
super(message, cause);
}

/*
* Ob table global index route exception.
*/
public ObTableGlobalIndexRouteException(Throwable cause) {
super(cause);
}

/*
* Is need refresh table entry.
*/
public boolean isNeedRefreshTableEntry() {
return false;
}
}
1 change: 1 addition & 0 deletions src/main/java/com/alipay/oceanbase/rpc/protocol/payload/ResultCodes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,7 @@ public enum ResultCodes {
OB_CLUSTER_NAME_NOT_EQUAL(-9016), //
OB_RS_LIST_INVAILD(-9017), //
OB_AGENT_HAS_FAILED_TASK(-9018), //
OB_ERR_KV_GLOBAL_INDEX_ROUTE(-10500),//
OB_KV_CREDENTIAL_NOT_MATCH(-10509), //
OB_KV_ROWKEY_COUNT_NOT_MATCH(-10510), //
OB_KV_COLUMN_TYPE_NOT_MATCH(-10511), //
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/com/alipay/oceanbase/rpc/stream/ObTableClientQueryStreamResult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.alipay.oceanbase.rpc.ObTableClient;
import com.alipay.oceanbase.rpc.exception.ObTableException;
import com.alipay.oceanbase.rpc.exception.ObTableGlobalIndexRouteException;
import com.alipay.oceanbase.rpc.exception.ObTableReplicaNotReadableException;
import com.alipay.oceanbase.rpc.exception.ObTableTimeoutExcetion;
import com.alipay.oceanbase.rpc.location.model.ObServerRoute;
Expand Down Expand Up @@ -144,6 +145,23 @@ protected ObTableQueryResult execute(ObPair<Long, ObTableParam> partIdWithIndex,
client.calculateContinuousFailure(indexTableName, e.getMessage());
throw e;
}
} else if (e instanceof ObTableGlobalIndexRouteException) {
if ((tryTimes - 1) < client.getRuntimeRetryTimes()) {
logger
.warn(
"meet global index route expcetion: indexTableName:{} partition id:{}, errorCode: {}, retry times {}",
indexTableName, partIdWithIndex.getLeft(),
((ObTableException) e).getErrorCode(), tryTimes, e);
indexTableName = client.getIndexTableName(tableName, tableQuery.getIndexName(),
tableQuery.getScanRangeColumns(), true);
} else {
logger
.warn(
"meet global index route expcetion: indexTableName:{} partition id:{}, errorCode: {}, reach max retry times {}",
indexTableName, partIdWithIndex.getLeft(),
((ObTableException) e).getErrorCode(), tryTimes, e);
throw e;
}
} else {
client.calculateContinuousFailure(indexTableName, e.getMessage());
throw e;
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/com/alipay/oceanbase/rpc/stream/async/ObTableClientQueryAsyncStreamResult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.alipay.oceanbase.rpc.ObTableClient;
import com.alipay.oceanbase.rpc.exception.ObTableException;
import com.alipay.oceanbase.rpc.exception.ObTableGlobalIndexRouteException;
import com.alipay.oceanbase.rpc.exception.ObTableTimeoutExcetion;
import com.alipay.oceanbase.rpc.location.model.partition.ObPair;
import com.alipay.oceanbase.rpc.protocol.payload.ObPayload;
Expand Down Expand Up @@ -92,6 +93,23 @@ protected ObTableQueryAsyncResult executeAsync(ObPair<Long, ObTableParam> partId
client.calculateContinuousFailure(indexTableName, e.getMessage());
throw e;
}
} else if (e instanceof ObTableGlobalIndexRouteException) {
if ((tryTimes - 1) < client.getRuntimeRetryTimes()) {
logger
.warn(
"meet global index route expcetion: indexTableName:{} partition id:{}, errorCode: {}, retry times {}",
indexTableName, partIdWithObTable.getLeft(),
((ObTableException) e).getErrorCode(), tryTimes, e);
indexTableName = client.getIndexTableName(tableName, tableQuery.getIndexName(),
tableQuery.getScanRangeColumns(), true);
} else {
logger
.warn(
"meet global index route expcetion: indexTableName:{} partition id:{}, errorCode: {}, reach max retry times {}",
indexTableName, partIdWithObTable.getLeft(),
((ObTableException) e).getErrorCode(), tryTimes, e);
throw e;
}
} else {
client.calculateContinuousFailure(indexTableName, e.getMessage());
throw e;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/alipay/oceanbase/rpc/table/ObTableClientQueryAsyncImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public Map<Long, ObPair<Long, ObTableParam>> getPartitions() throws Exception {
String indexName = tableQuery.getIndexName();
if (!this.obTableClient.isOdpMode()) {
indexTableName = obTableClient.getIndexTableName(tableName, indexName,
tableQuery.getScanRangeColumns());
tableQuery.getScanRangeColumns(), false);
}

this.partitionObTables = new HashMap<Long, ObPair<Long, ObTableParam>>();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/alipay/oceanbase/rpc/table/ObTableClientQueryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public ObTableClientQueryStreamResult executeInternal() throws Exception {
String indexName = tableQuery.getIndexName();
if (!this.obTableClient.isOdpMode()) {
indexTableName = obTableClient.getIndexTableName(tableName, indexName,
tableQuery.getScanRangeColumns());
tableQuery.getScanRangeColumns(), false);
}

for (ObNewRange rang : tableQuery.getKeyRanges()) {
Expand Down

0 comments on commit fdfe9fb

Please sign in to comment.