rollback initHttpServer update, might be flaky

Signed-off-by: pengyu <[email protected]>
py023 · Feb 27, 2024 · fb25b6e · fb25b6e
1 parent e9f4404
commit fb25b6e
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/fe/fe-core/src/test/java/org/apache/doris/http/DorisHttpTestCase.java b/fe/fe-core/src/test/java/org/apache/doris/http/DorisHttpTestCase.java
@@ -43,7 +43,6 @@
 import org.apache.doris.common.ExceptionChecker.ThrowingRunnable;
 import org.apache.doris.common.FeConstants;
 import org.apache.doris.common.jmockit.Deencapsulation;
-import org.apache.doris.common.util.UnitTestUtil;
 import org.apache.doris.datasource.CatalogMgr;
 import org.apache.doris.datasource.InternalCatalog;
 import org.apache.doris.httpv2.HttpServer;
@@ -75,6 +74,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.ServerSocket;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -326,8 +326,24 @@ private static void assignBackends() {
 
     @BeforeClass
     public static void initHttpServer() throws IllegalArgException, InterruptedException {
-        HTTP_PORT = UnitTestUtil.findValidPort();
-        URI = "http://localhost:" + HTTP_PORT + "/api/" + DB_NAME + "/" + TABLE_NAME;
+        ServerSocket socket = null;
+        try {
+            socket = new ServerSocket(0);
+            socket.setReuseAddress(true);
+            HTTP_PORT = socket.getLocalPort();
+            URI = "http://localhost:" + HTTP_PORT + "/api/" + DB_NAME + "/" + TABLE_NAME;
+        } catch (Exception e) {
+            throw new IllegalStateException("Could not find a free TCP/IP port to start HTTP Server on");
+        } finally {
+            if (socket != null) {
+                try {
+                    socket.close();
+                } catch (Exception e) {
+                    // CHECKSTYLE IGNORE THIS LINE
+                }
+            }
+        }
+
         FeConstants.runningUnitTest = true;
         httpServer = new HttpServer();
         httpServer.setPort(HTTP_PORT);