(iotdb) branch pipe-filter-system-databases updated: fix

[rong]

This is an automated email from the ASF dual-hosted git repository.

rong pushed a commit to branch pipe-filter-system-databases
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/pipe-filter-system-databases 
by this push:
     new e2ad27ef2b5 fix
e2ad27ef2b5 is described below

commit e2ad27ef2b5d7f45d89801d5c949561b74dc6117
Author: Steve Yurong Su <r...@apache.org>
AuthorDate: Wed Jul 17 17:24:02 2024 +0800

    fix
---
 .../manager/pipe/coordinator/runtime/PipeLeaderChangeHandler.java      | 3 ++-
 .../confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java      | 3 ++-
 .../confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/PipeLeaderChangeHandler.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/PipeLeaderChangeHandler.java
index f2d998674cc..ecfab4942c5 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/PipeLeaderChangeHandler.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/PipeLeaderChangeHandler.java
@@ -87,7 +87,8 @@ public class PipeLeaderChangeHandler implements 
IClusterStatusSubscriber {
               // Pipe only collect user's data, filter metric database here.
               // DatabaseName may be null for config region group
               if (Objects.nonNull(databaseName)
-                  && !databaseName.startsWith(SchemaConstant.SYSTEM_DATABASE)) 
{
+                  && !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());
diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java
index 78b4469eb7e..5c11d40f6f9 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java
@@ -136,7 +136,8 @@ public class AlterPipeProcedureV2 extends 
AbstractOperatePipeProcedureV2 {
               final PipeTaskMeta currentPipeTaskMeta =
                   
currentConsensusGroupId2PipeTaskMeta.get(regionGroupId.getId());
               if (databaseName != null
-                  && !databaseName.startsWith(SchemaConstant.SYSTEM_DATABASE)
+                  && !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(
diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java
index fd07f57ad0a..68075b5911d 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java
@@ -173,7 +173,8 @@ public class CreatePipeProcedureV2 extends 
AbstractOperatePipeProcedureV2 {
                         .getPartitionManager()
                         .getRegionStorageGroup(regionGroupId);
                 if (databaseName != null
-                    && 
!databaseName.startsWith(SchemaConstant.SYSTEM_DATABASE)) {
+                    && !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(),