fixup

apache · Aug 5, 2024 · 3c73876 · 3c73876
1 parent 5be7366
commit 3c73876
Show file tree

Hide file tree

Showing 45 changed files with 325 additions and 2 deletions.
diff --git a/.github/workflows/pipe-it-2cluster.yml b/.github/workflows/pipe-it-2cluster.yml
@@ -138,3 +138,39 @@ jobs:
           name: cluster-log-subscription-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster1 }}-${{ matrix.cluster2 }}
           path: integration-test/target/cluster-logs
           retention-days: 30
+  subscription-regression:
+    strategy:
+      fail-fast: false
+      max-parallel: 15
+      matrix:
+        java: [ 17 ]
+        cluster1: [ ScalableSingleNodeMode ]
+        cluster2: [ ScalableSingleNodeMode ]
+        os: [ ubuntu-latest ]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: liberica
+          java-version: ${{ matrix.java }}
+      - name: IT Test
+        shell: bash
+        # we do not compile client-cpp for saving time, it is tested in client.yml
+        # we can skip influxdb-protocol because it has been tested separately in influxdb-protocol.yml
+        run: |
+          mvn clean verify \
+          -P with-integration-tests \
+          -DskipUTs \
+          -DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \
+          -DClusterConfigurations=${{ matrix.cluster1 }},${{ matrix.cluster2 }} \
+          -pl integration-test \
+          -am -PMultiClusterIT2SubscriptionRegression
+      - name: Upload Artifact
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: cluster-log-subscription-regression-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster1 }}-${{ matrix.cluster2 }}
+          path: integration-test/target/cluster-logs
+          retention-days: 30
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
@@ -415,7 +415,7 @@
             </activation>
             <properties>
                 <integrationTest.excludedGroups/>
-                <integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT1,org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema,org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema,org.apache.iotdb.itbase.category.MultiClusterIT2Subscription,org.apache.iotdb.itbase.category.MultiClusterIT3</integrationTest.includedGroups>
+                <integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT1,org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema,org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema,org.apache.iotdb.itbase.category.MultiClusterIT2Subscription,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression,org.apache.iotdb.itbase.category.MultiClusterIT3</integrationTest.includedGroups>
                 <integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
                 <integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
                 <integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode>
@@ -478,6 +478,20 @@
                 <integrationTest.testEnv>MultiCluster</integrationTest.testEnv>
             </properties>
         </profile>
+        <profile>
+            <id>MultiClusterIT2SubscriptionRegression</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <integrationTest.excludedGroups/>
+                <integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression</integrationTest.includedGroups>
+                <integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
+                <integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
+                <integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode>
+                <integrationTest.testEnv>MultiCluster</integrationTest.testEnv>
+            </properties>
+        </profile>
         <profile>
             <id>MultiClusterIT3</id>
             <activation>

diff --git a/...src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionRegression.java b/...src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionRegression.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.itbase.category;
+
+public interface MultiClusterIT2SubscriptionRegression {}
diff --git a/...va/org/apache/iotdb/subscription/it/triple/auto_create_db/DefaultPullConsumerDataSet.java b/...va/org/apache/iotdb/subscription/it/triple/auto_create_db/DefaultPullConsumerDataSet.java
@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.subscription.it.triple.auto_create_db;
 
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.subscription.consumer.SubscriptionPullConsumer;
@@ -31,12 +33,16 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2SubscriptionRegression.class})
 public class DefaultPullConsumerDataSet extends TestConfig {
   public static SubscriptionPullConsumer consumer;
   private int deviceCount = 3;

diff --git a/...ava/org/apache/iotdb/subscription/it/triple/auto_create_db/DefaultTsfilePushConsumer.java b/...ava/org/apache/iotdb/subscription/it/triple/auto_create_db/DefaultTsfilePushConsumer.java
@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.subscription.it.triple.auto_create_db;
 
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.subscription.consumer.AckStrategy;
@@ -38,6 +40,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -53,6 +57,8 @@
  * pattern: root.**
  * TsFile
  */
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2SubscriptionRegression.class})
 public class DefaultTsfilePushConsumer extends TestConfig {
   private SubscriptionPushConsumer consumer;
   private int deviceCount = 3;

diff --git a/.../java/org/apache/iotdb/subscription/it/triple/auto_create_db/RootDatasetPushConsumer.java b/.../java/org/apache/iotdb/subscription/it/triple/auto_create_db/RootDatasetPushConsumer.java
@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.subscription.it.triple.auto_create_db;
 
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.subscription.consumer.AckStrategy;
@@ -34,6 +36,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -47,6 +51,8 @@
  * pattern: root
  * DataSet
  */
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2SubscriptionRegression.class})
 public class RootDatasetPushConsumer extends TestConfig {
   private String pattern = "root.**";
   public static SubscriptionPushConsumer consumer;

diff --git a/...st/java/org/apache/iotdb/subscription/it/triple/auto_create_db/RootPullConsumeTsfile.java b/...st/java/org/apache/iotdb/subscription/it/triple/auto_create_db/RootPullConsumeTsfile.java
@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.subscription.it.triple.auto_create_db;
 
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.subscription.consumer.SubscriptionPullConsumer;
@@ -31,6 +33,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -41,6 +45,8 @@
  * pattern: db
  * Tsfile
  */
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2SubscriptionRegression.class})
 public class RootPullConsumeTsfile extends TestConfig {
   private static final String pattern = "root.**";
   private static final String device = "root.auto_create_db.RootPullConsumeTsfile.d_0";

diff --git a/...e/iotdb/subscription/it/triple/mix/PushConsumerPullConsumerWith1TopicShareProcessMix.java b/...e/iotdb/subscription/it/triple/mix/PushConsumerPullConsumerWith1TopicShareProcessMix.java
@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.subscription.it.triple.mix;
 
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.subscription.consumer.AckStrategy;
@@ -37,6 +39,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -50,6 +54,8 @@
  * Dataset
  * result:pass
  */
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2SubscriptionRegression.class})
 public class PushConsumerPullConsumerWith1TopicShareProcessMix extends TestConfig {
   private static String topicName = "`1-group.1-consumer.db`";
   private static List<MeasurementSchema> schemaList = new ArrayList<>();

diff --git a/...ubscription/it/triple/pullconsumer/autocommit/TestAutoCommitFalseDataSetPullConsumer.java b/...ubscription/it/triple/pullconsumer/autocommit/TestAutoCommitFalseDataSetPullConsumer.java
@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.subscription.it.triple.pullconsumer.autocommit;
 
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.Session;
@@ -35,6 +37,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -53,6 +57,8 @@
  * Tests can be more focused on situations where autoCommit is true. In this case, if not explicitly committed, it is expected that all messages successfully polled by the consumer should be committed before the consumer is closed (reflected in the Pipe as no accumulated resources).
  * result: pass
  */
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2SubscriptionRegression.class})
 public class TestAutoCommitFalseDataSetPullConsumer extends TestConfig {
   private static final String database = "root.TestAutoCommitFalseDataSetPullConsumer";
   private static final String device = database + ".d_0";

diff --git a/...subscription/it/triple/pullconsumer/autocommit/TestAutoCommitTrueDataSetPullConsumer.java b/...subscription/it/triple/pullconsumer/autocommit/TestAutoCommitTrueDataSetPullConsumer.java
@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.subscription.it.triple.pullconsumer.autocommit;
 
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.Session;
@@ -35,6 +37,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -48,6 +52,8 @@
  * pattern: device
  * result: pass
  */
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2SubscriptionRegression.class})
 public class TestAutoCommitTrueDataSetPullConsumer extends TestConfig {
   private static final String database = "root.test.TestAutoCommitTrueDataSetPullConsumer";
   private static final String device = database + ".d_0";

diff --git a/...va/org/apache/iotdb/subscription/it/triple/pullconsumer/format/DBDataSetPullConsumer.java b/...va/org/apache/iotdb/subscription/it/triple/pullconsumer/format/DBDataSetPullConsumer.java
@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.subscription.it.triple.pullconsumer.format;
 
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.subscription.consumer.SubscriptionPullConsumer;
@@ -33,6 +35,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -43,6 +47,8 @@
  * pattern: db
  * result: pass
  */
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2SubscriptionRegression.class})
 public class DBDataSetPullConsumer extends TestConfig {
   private static final String database = "root.test.DBDataSetPullConsumer";
   private static final String device = database + ".d_0";

diff --git a/...ava/org/apache/iotdb/subscription/it/triple/pullconsumer/format/DBTsfilePullConsumer.java b/...ava/org/apache/iotdb/subscription/it/triple/pullconsumer/format/DBTsfilePullConsumer.java
@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.subscription.it.triple.pullconsumer.format;
 
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.subscription.consumer.SubscriptionPullConsumer;
@@ -33,6 +35,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -43,6 +47,8 @@
  * pattern: db
  * result: pass
  */
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2SubscriptionRegression.class})
 public class DBTsfilePullConsumer extends TestConfig {
   private static final String database = "root.test.DBTsfilePullConsumer";
   private static final String device = database + ".d_0";

diff --git a/...pache/iotdb/subscription/it/triple/pullconsumer/loose_range/AllTsDatasetPullConsumer.java b/...pache/iotdb/subscription/it/triple/pullconsumer/loose_range/AllTsDatasetPullConsumer.java
@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.subscription.it.triple.pullconsumer.loose_range;
 
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.rpc.subscription.config.TopicConstant;
@@ -34,6 +36,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -46,6 +50,8 @@
  * format: dataset
  * result: pass
  */
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2SubscriptionRegression.class})
 public class AllTsDatasetPullConsumer extends TestConfig {
   private static final String database = "root.AllTsDatasetPullConsumer";
   private static final String database2 = "root.test.AllTsDatasetPullConsumer";

diff --git a/...apache/iotdb/subscription/it/triple/pullconsumer/loose_range/AllTsTsfilePullConsumer.java b/...apache/iotdb/subscription/it/triple/pullconsumer/loose_range/AllTsTsfilePullConsumer.java
@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.subscription.it.triple.pullconsumer.loose_range;
 
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegression;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.rpc.subscription.config.TopicConstant;
@@ -34,6 +36,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -46,6 +50,8 @@
  * Tsfile
  * result: pass
  */
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2SubscriptionRegression.class})
 public class AllTsTsfilePullConsumer extends TestConfig {
   private static final String database = "root.test.AllTsTsfilePullConsumer";
   private static final String database2 = "root.AllTsTsfilePullConsumer";