Skip to content

[to rc/1.3.3] Fix DeleteDatabaseProcedure (#13927) #13973

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
OneSizeFitsQuorum merged 1 commit into from
Nov 6, 2024
Merged

[to rc/1.3.3] Fix DeleteDatabaseProcedure (#13927) #13973

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
24 changes: 13 additions & 11 deletions .../main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteDatabaseProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,6 @@ protected Flow executeFromState(ConfigNodeProcedureEnv env, DeleteStorageGroupSt
env.getConfigManager().getConsensusManager().write(dataRegionDeleteTaskOfferPlan);
}

// Delete DatabasePartitionTable
final TSStatus deleteConfigResult =
env.deleteDatabaseConfig(deleteDatabaseSchema.getName(), isGeneratedByPipe);

// Delete Database metrics
PartitionMetrics.unbindDatabaseRelatedMetricsWhenUpdate(
MetricService.getInstance(), deleteDatabaseSchema.getName());

// try sync delete schemaengine region
DataNodeAsyncRequestContext<TConsensusGroupId, TSStatus> asyncClientHandler =
new DataNodeAsyncRequestContext<>(CnToDnAsyncRequestType.DELETE_REGION);
Expand Down Expand Up @@ -200,13 +192,23 @@ protected Flow executeFromState(ConfigNodeProcedureEnv env, DeleteStorageGroupSt
}
}

env.getConfigManager()
.getLoadManager()
.clearDataPartitionPolicyTable(deleteDatabaseSchema.getName());
LOG.info("data partition policy table cleared.");

// Delete Database metrics
PartitionMetrics.unbindDatabaseRelatedMetricsWhenUpdate(
MetricService.getInstance(), deleteDatabaseSchema.getName());

// Delete DatabasePartitionTable
final TSStatus deleteConfigResult =
env.deleteDatabaseConfig(deleteDatabaseSchema.getName(), isGeneratedByPipe);

if (deleteConfigResult.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
LOG.info(
"[DeleteDatabaseProcedure] Database: {} is deleted successfully",
deleteDatabaseSchema.getName());
env.getConfigManager()
.getLoadManager()
.clearDataPartitionPolicyTable(deleteDatabaseSchema.getName());
return Flow.NO_MORE_STATE;
} else if (getCycles() > RETRY_THRESHOLD) {
setFailure(
Expand Down
2 changes: 2 additions & 0 deletions ...b-core/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.utils.PathUtils;
import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.rpc.TSStatusCode;

import java.util.ArrayList;
Expand Down Expand Up @@ -56,6 +57,7 @@ public Map<String, Map<TSeriesPartitionSlot, TRegionReplicaSet>> getSchemaPartit
return schemaPartitionMap;
}

@TestOnly
public void setSchemaPartitionMap(
Map<String, Map<TSeriesPartitionSlot, TRegionReplicaSet>> schemaPartitionMap) {
this.schemaPartitionMap = schemaPartitionMap;
Expand Down