fix

zuston · Dec 15, 2023 · d762ed4 · d762ed4
1 parent 82e9c02
commit d762ed4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorGrpcTest.java b/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorGrpcTest.java
@@ -39,6 +39,7 @@
 import org.apache.uniffle.common.ShuffleServerInfo;
 import org.apache.uniffle.common.config.RssBaseConf;
 import org.apache.uniffle.common.config.RssConf;
+import org.apache.uniffle.common.rpc.ServerType;
 import org.apache.uniffle.common.rpc.StatusCode;
 import org.apache.uniffle.common.storage.StorageInfo;
 import org.apache.uniffle.common.storage.StorageMedia;
@@ -56,6 +57,7 @@
 import org.apache.uniffle.server.ShuffleServer;
 import org.apache.uniffle.server.ShuffleServerConf;
 
+import static org.apache.uniffle.common.config.RssBaseConf.RPC_SERVER_TYPE;
 import static org.apache.uniffle.common.metrics.GRPCMetrics.GRPC_SERVER_CONNECTION_NUMBER_KEY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -304,6 +306,7 @@ public void shuffleServerHeartbeatTest() throws Exception {
  ShuffleServerConf shuffleServerConf = shuffleServers.get(0).getShuffleServerConf();
  shuffleServerConf.setInteger("rss.rpc.server.port", SHUFFLE_SERVER_PORT + 2);
  shuffleServerConf.setInteger("rss.jetty.http.port", 18082);
+ shuffleServerConf.set(RPC_SERVER_TYPE, ServerType.GRPC_NETTY);
  shuffleServerConf.setInteger(ShuffleServerConf.NETTY_SERVER_PORT, SHUFFLE_SERVER_PORT + 5);
  shuffleServerConf.set(ShuffleServerConf.STORAGE_MEDIA_PROVIDER_ENV_KEY, "RSS_ENV_KEY");
  String baseDir = shuffleServerConf.get(ShuffleServerConf.RSS_STORAGE_BASE_PATH).get(0);

diff --git a/integration-test/common/src/test/java/org/apache/uniffle/test/IntegrationTestBase.java b/integration-test/common/src/test/java/org/apache/uniffle/test/IntegrationTestBase.java
@@ -29,6 +29,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.io.TempDir;
 
+import org.apache.uniffle.common.rpc.ServerType;
 import org.apache.uniffle.common.util.RssUtils;
 import org.apache.uniffle.coordinator.CoordinatorConf;
 import org.apache.uniffle.coordinator.CoordinatorServer;
@@ -40,6 +41,8 @@
 import org.apache.uniffle.storage.HadoopTestBase;
 import org.apache.uniffle.storage.util.StorageType;
 
+import static org.apache.uniffle.common.config.RssBaseConf.RPC_SERVER_TYPE;
+
 public abstract class IntegrationTestBase extends HadoopTestBase {
 
  protected static final int SHUFFLE_SERVER_PORT = 20001;
@@ -128,6 +131,7 @@ protected static ShuffleServerConf getShuffleServerConf() throws Exception {
  serverConf.setBoolean("rss.server.health.check.enable", false);
  serverConf.setBoolean(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
  serverConf.set(ShuffleServerConf.SERVER_TRIGGER_FLUSH_CHECK_INTERVAL, 500L);
+ serverConf.set(RPC_SERVER_TYPE, ServerType.GRPC_NETTY);
  serverConf.setInteger(
  ShuffleServerConf.NETTY_SERVER_PORT, NETTY_PORT + nettyPortCounter.getAndIncrement());
  serverConf.setString("rss.server.tags", "GRPC,GRPC_NETTY");