111

Author: swuferhong

fluss-client/src/test/java/com/alibaba/fluss/client/admin/ClientToServerITCaseBase.java

@@ -96,7 +96,7 @@ protected long createTable(
         return admin.getTable(tablePath).get().getTableId();
     }
 
-    private static Configuration initConfig() {
+    public static Configuration initConfig() {
         Configuration conf = new Configuration();
         conf.setInt(ConfigOptions.DEFAULT_REPLICATION_FACTOR, 3);
         // set a shorter interval for testing purpose
@@ -117,7 +117,7 @@ protected static LogScanner createLogScanner(Table table, int[] projectFields) {
         return table.getLogScanner(new LogScan().withProjectedFields(projectFields));
     }
 
-    protected static void subscribeFromBeginning(LogScanner logScanner, Table table) {
+    public static void subscribeFromBeginning(LogScanner logScanner, Table table) {
         int bucketCount = getBucketCount(table);
         for (int i = 0; i < bucketCount; i++) {
             logScanner.subscribeFromBeginning(i);

fluss-client/src/test/java/com/alibaba/fluss/client/table/FlussFailServerTableITCase.java

@@ -16,24 +16,32 @@
 
 package com.alibaba.fluss.client.table;
 
-import com.alibaba.fluss.client.admin.ClientToServerITCaseBase;
+import com.alibaba.fluss.client.Connection;
+import com.alibaba.fluss.client.ConnectionFactory;
+import com.alibaba.fluss.client.admin.Admin;
 import com.alibaba.fluss.client.scanner.ScanRecord;
 import com.alibaba.fluss.client.scanner.log.LogScan;
 import com.alibaba.fluss.client.scanner.log.LogScanner;
 import com.alibaba.fluss.client.scanner.log.ScanRecords;
 import com.alibaba.fluss.client.table.writer.AppendWriter;
 import com.alibaba.fluss.client.table.writer.UpsertWriter;
+import com.alibaba.fluss.config.Configuration;
 import com.alibaba.fluss.metadata.TablePath;
 import com.alibaba.fluss.row.InternalRow;
 import com.alibaba.fluss.row.indexed.IndexedRow;
+import com.alibaba.fluss.server.testutils.FlussClusterExtension;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.alibaba.fluss.client.admin.ClientToServerITCaseBase.initConfig;
+import static com.alibaba.fluss.client.admin.ClientToServerITCaseBase.subscribeFromBeginning;
 import static com.alibaba.fluss.record.TestData.DATA1_ROW_TYPE;
 import static com.alibaba.fluss.record.TestData.DATA1_TABLE_INFO;
 import static com.alibaba.fluss.record.TestData.DATA1_TABLE_INFO_PK;
@@ -42,17 +50,41 @@
 import static com.alibaba.fluss.testutils.InternalRowListAssert.assertThatRows;
 
 /** IT case for {@link FlussTable} in the case of one tablet server fails. */
-class FlussFailServerTableITCase extends ClientToServerITCaseBase {
+class FlussFailServerTableITCase {
+
+    @RegisterExtension
+    public static final FlussClusterExtension FLUSS_CLUSTER_EXTENSION =
+            FlussClusterExtension.builder()
+                    .setNumOfTabletServers(3)
+                    .setClusterConf(initConfig())
+                    .build();
 
     private static final int SERVER = 0;
+    private Connection conn;
+    protected Admin admin;
 
     @BeforeEach
-    void beforeEach() throws Exception {
+    void beforeEach() {
+        Configuration clientConf = FLUSS_CLUSTER_EXTENSION.getClientConfig();
+        conn = ConnectionFactory.createConnection(clientConf);
+        admin = conn.getAdmin();
+
         // since we kill and start one tablet server in each test,
         // we need to wait for metadata to be updated to servers
         FLUSS_CLUSTER_EXTENSION.waitUtilAllGatewayHasSameMetadata();
+    }
 
-        super.setup();
+    @AfterEach
+    protected void teardown() throws Exception {
+        if (admin != null) {
+            admin.close();
+            admin = null;
+        }
+
+        if (conn != null) {
+            conn.close();
+            conn = null;
+        }
     }
 
     @Test

fluss-server/src/test/java/com/alibaba/fluss/server/testutils/FlussClusterExtension.java

@@ -382,7 +382,6 @@ public void waitUtilAllGatewayHasSameMetadata() {
                                 }
                             }
                         }
-                        LOG.info("success once !");
 
                         assertThat(response.hasCoordinatorServer()).isTrue();
                         // check coordinator server node