Skip to content

Fix concurrent bug in PartitonCache #11622

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
JackieTien97 merged 3 commits into from
Nov 27, 2023
Merged

Fix concurrent bug in PartitonCache #11622

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6afb2d8
init
JackieTien97 Nov 27, 2023
e7cfe07
Fix concurrent bug in PartitonCache
JackieTien97 Nov 27, 2023
65363a3
delete useless lines
JackieTien97 Nov 27, 2023
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
12 changes: 5 additions & 7 deletions ...ain/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/partition/PartitionCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ private String getStorageGroupName(String devicePath) {
private void fetchStorageGroupAndUpdateCache(
StorageGroupCacheResult<?> result, List<String> devicePaths)
throws ClientManagerException, TException {
storageGroupCacheLock.writeLock().lock();
try (ConfigNodeClient client =
configNodeClientManager.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
storageGroupCacheLock.writeLock().lock();
result.reset();
getStorageGroupMap(result, devicePaths, true);
if (!result.isSuccess()) {
Expand All @@ -204,6 +204,7 @@ private void fetchStorageGroupAndUpdateCache(
Set<String> storageGroupNames = storageGroupSchemaResp.getDatabaseSchemaMap().keySet();
// update all database into cache
updateStorageCache(storageGroupNames);
getStorageGroupMap(result, devicePaths, true);
}
}
} finally {
Expand All @@ -222,9 +223,9 @@ private void fetchStorageGroupAndUpdateCache(
private void createStorageGroupAndUpdateCache(
StorageGroupCacheResult<?> result, List<String> devicePaths, String userName)
throws ClientManagerException, MetadataException, TException {
storageGroupCacheLock.writeLock().lock();
try (ConfigNodeClient client =
configNodeClientManager.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
storageGroupCacheLock.writeLock().lock();
// try to check whether database need to be created
result.reset();
// try to hit database with all missed devices
Expand Down Expand Up @@ -275,6 +276,7 @@ private void createStorageGroupAndUpdateCache(
}
// try to update database cache when all databases has already been created
updateStorageCache(storageGroupNamesNeedCreated);
getStorageGroupMap(result, devicePaths, false);
}
} finally {
storageGroupCacheLock.writeLock().unlock();
Expand Down Expand Up @@ -355,15 +357,11 @@ private void getStorageGroupCacheResult(
try {
// try to fetch database from config node when miss
fetchStorageGroupAndUpdateCache(result, devicePaths);
// second try to hit database in fast-fail way
getStorageGroupMap(result, devicePaths, true);
if (!result.isSuccess() && isAutoCreate) {
// try to auto create database of failed device
createStorageGroupAndUpdateCache(result, devicePaths, userName);
// third try to hit database in fast-fail way
getStorageGroupMap(result, devicePaths, true);
if (!result.isSuccess()) {
throw new StatementAnalyzeException("Failed to get database Map in three attempts.");
throw new StatementAnalyzeException("Failed to get database Map");
}
}
} catch (TException | MetadataException | ClientManagerException e) {
Expand Down