Skip to content

Pipe: filter out databases whose name starts with root.__system. #12957

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
SteveYurongSu merged 3 commits into from
Jul 18, 2024
Merged

Pipe: filter out databases whose name starts with root.__system. #12957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01248bd
Pipe: filter out databases whose name starts with but not equals to `…
SteveYurongSu Jul 17, 2024
e2ad27e
fix
SteveYurongSu Jul 17, 2024
7e23401
Update PipeLeaderChangeHandler.java
SteveYurongSu Jul 17, 2024
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
5 changes: 4 additions & 1 deletion ...org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/PipeLeaderChangeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

import java.util.HashMap;
import java.util.Map;
import java.util.Objects;

public class PipeLeaderChangeHandler implements IClusterStatusSubscriber {

Expand Down Expand Up @@ -85,7 +86,9 @@ public void onConsensusGroupStatisticsChanged(ConsensusGroupStatisticsChangeEven
configManager.getPartitionManager().getRegionStorageGroup(regionGroupId);
// Pipe only collect user's data, filter metric database here.
// DatabaseName may be null for config region group
if (!SchemaConstant.SYSTEM_DATABASE.equals(databaseName)) {
if (Objects.isNull(databaseName)
|| (!databaseName.equals(SchemaConstant.SYSTEM_DATABASE)
&& !databaseName.startsWith(SchemaConstant.SYSTEM_DATABASE + "."))) {
// null or -1 means empty origin leader
final int oldLeaderNodeId = (pair.left == null ? -1 : pair.left.getLeaderId());
final int newLeaderNodeId = (pair.right == null ? -1 : pair.right.getLeaderId());
Expand Down
6 changes: 4 additions & 2 deletions .../main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public void executeFromCalculateInfoForTask(ConfigNodeProcedureEnv env) {
currentConsensusGroupId2PipeTaskMeta.get(regionGroupId.getId());
if (databaseName != null
&& !databaseName.equals(SchemaConstant.SYSTEM_DATABASE)
&& !databaseName.startsWith(SchemaConstant.SYSTEM_DATABASE + ".")
&& currentPipeTaskMeta.getLeaderNodeId() == regionLeaderNodeId) {
// Pipe only collect user's data, filter metric database here.
updatedConsensusGroupIdToTaskMetaMap.put(
Expand All @@ -151,15 +152,16 @@ public void executeFromCalculateInfoForTask(ConfigNodeProcedureEnv env) {
// config region
updatedConsensusGroupIdToTaskMetaMap.put(
// 0 is the consensus group id of the config region, but data region id and schema region
// id
// also start from 0, so we use Integer.MIN_VALUE to represent the config region
// id also start from 0, so we use Integer.MIN_VALUE to represent the config region
Integer.MIN_VALUE,
new PipeTaskMeta(
configRegionTaskMeta.getProgressIndex(),
// The leader of the config region is the config node itself
ConfigNodeDescriptor.getInstance().getConf().getConfigNodeId()));
}

updatedPipeRuntimeMeta = new PipeRuntimeMeta(updatedConsensusGroupIdToTaskMetaMap);

// If the pipe's previous status was user stopped, then after the alter operation, the pipe's
// status remains user stopped; otherwise, it becomes running.
if (!pipeTaskInfo.get().isPipeStoppedByUser(alterPipeRequest.getPipeName())) {
Expand Down
4 changes: 3 additions & 1 deletion ...main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,9 @@ public void executeFromCalculateInfoForTask(ConfigNodeProcedureEnv env) {
env.getConfigManager()
.getPartitionManager()
.getRegionStorageGroup(regionGroupId);
if (databaseName != null && !databaseName.equals(SchemaConstant.SYSTEM_DATABASE)) {
if (databaseName != null
&& !databaseName.equals(SchemaConstant.SYSTEM_DATABASE)
&& !databaseName.startsWith(SchemaConstant.SYSTEM_DATABASE + ".")) {
// Pipe only collect user's data, filter out metric database here.
consensusGroupIdToTaskMetaMap.put(
regionGroupId.getId(),
Expand Down