You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@submarine.apache.org by by...@apache.org on 2021/07/06 05:32:20 UTC
[submarine] branch master updated: SUBMARINE-898. Shield the
cluster features in submarine server
This is an automated email from the ASF dual-hosted git repository.
byronhsu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 0ac5607 SUBMARINE-898. Shield the cluster features in submarine server
0ac5607 is described below
commit 0ac5607d5c40e7bd30409fcd382fa551cfc6257b
Author: KUAN-HSUN-LI <b0...@ntu.edu.tw>
AuthorDate: Sun Jul 4 13:32:43 2021 +0800
SUBMARINE-898. Shield the cluster features in submarine server
### What is this PR for?
Shield cluster in submarine server since it is useless now.
### What type of PR is it?
[Improvement]
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-898
### How should this be tested?
CI test
### Screenshots (if appropriate)
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: KUAN-HSUN-LI <b0...@ntu.edu.tw>
Signed-off-by: byronhsu <by...@apache.org>
Closes #640 from KUAN-HSUN-LI/SUBMARINE-898 and squashes the following commits:
9110532e [KUAN-HSUN-LI] SUBMARINE-898. Shield Submarine Cluster
2c99168a [KUAN-HSUN-LI] SUBMARINE-898. Shield Submarine Cluster
---
.../src/main/java/org/apache/submarine/server/SubmarineServer.java | 3 ++-
.../java/org/apache/submarine/server/SubmarineServerClusterTest.java | 5 +++++
.../java/org/apache/submarine/server/rest/ClusterRestApiTest.java | 4 ++++
.../org/apache/submarine/interpreter/InterpreterClusterTest.java | 2 ++
4 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/SubmarineServer.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/SubmarineServer.java
index 43ccbf9..b003fbc 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/SubmarineServer.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/SubmarineServer.java
@@ -118,7 +118,8 @@ public class SubmarineServer extends ResourceConfig {
setupNotebookServer(webApp, conf, sharedServiceLocator);
// Cluster Server
- setupClusterServer();
+ // Cluster Server is useless for submarine now. Shield it to improve performance.
+ // setupClusterServer();
rpcServer = SubmarineRpcServer.startRpcServer();
startServer();
diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/SubmarineServerClusterTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/SubmarineServerClusterTest.java
index da45676..6c1a65d 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/SubmarineServerClusterTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/SubmarineServerClusterTest.java
@@ -31,6 +31,7 @@ import org.apache.submarine.server.response.JsonResponse;
import org.apache.submarine.server.rest.RestConstants;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -103,6 +104,7 @@ public class SubmarineServerClusterTest extends AbstractSubmarineServerTest {
LOG.info("SubmarineServerClusterTest::stop <<<");
}
+ @Ignore
@Test
public void testGetServerClusterMeta() {
LOG.info("SubmarineServerClusterTest::testGetServerClusterMeta >>>");
@@ -118,6 +120,7 @@ public class SubmarineServerClusterTest extends AbstractSubmarineServerTest {
LOG.info("SubmarineServerClusterTest::testGetServerClusterMeta <<<");
}
+ @Ignore
@Test
public void testGetClusterAddress() throws IOException {
GetMethod response = httpGet("/api/" + RestConstants.V1 + "/"
@@ -159,11 +162,13 @@ public class SubmarineServerClusterTest extends AbstractSubmarineServerTest {
return listNodes;
}
+ @Ignore
@Test
public void testGetClusterNodes() throws IOException {
getClusterNodes();
}
+ @Ignore
@Test
public void testGetClusterNode() throws IOException {
ArrayList<HashMap<String, Object>> listNodes = getClusterNodes();
diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ClusterRestApiTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ClusterRestApiTest.java
index 04ecf12..db26bd7 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ClusterRestApiTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ClusterRestApiTest.java
@@ -29,6 +29,7 @@ import org.apache.submarine.commons.cluster.meta.ClusterMeta;
import org.apache.submarine.commons.cluster.meta.ClusterMetaType;
import org.apache.submarine.commons.utils.SubmarineConfiguration;
import org.apache.submarine.commons.cluster.ClusterServer;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.BeforeClass;
@@ -102,6 +103,7 @@ public class ClusterRestApiTest {
mockClusterServer.putClusterMeta(SERVER_META, nodeName2, meta2);
}
+ @Ignore
@Test
public void testGetClusterAddress() {
SubmarineConfiguration conf = SubmarineConfiguration.getInstance();
@@ -115,6 +117,7 @@ public class ClusterRestApiTest {
assertEquals(addr2, result.get(1));
}
+ @Ignore
@Test
public void testGetClusterNodes() {
when(mockClusterServer.getClusterMeta(ClusterMetaType.SERVER_META, "")).thenReturn(clusterMetas);
@@ -134,6 +137,7 @@ public class ClusterRestApiTest {
assertEquals("0.25 / 0.40 = 62.50%", properties2.get("CPU_USED / CPU_CAPACITY"));
}
+ @Ignore
@Test
public void testGetClusterNode() {
when(mockClusterServer.getClusterMeta(ClusterMetaType.INTP_PROCESS_META, "")).thenReturn(clusterMetas);
diff --git a/submarine-workbench/interpreter/python-interpreter/src/test/java/org/apache/submarine/interpreter/InterpreterClusterTest.java b/submarine-workbench/interpreter/python-interpreter/src/test/java/org/apache/submarine/interpreter/InterpreterClusterTest.java
index 8fc91f7..97e8540 100644
--- a/submarine-workbench/interpreter/python-interpreter/src/test/java/org/apache/submarine/interpreter/InterpreterClusterTest.java
+++ b/submarine-workbench/interpreter/python-interpreter/src/test/java/org/apache/submarine/interpreter/InterpreterClusterTest.java
@@ -24,6 +24,7 @@ import org.apache.submarine.commons.utils.NetworkUtils;
import org.apache.submarine.commons.utils.SubmarineConfiguration;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -106,6 +107,7 @@ public class InterpreterClusterTest {
LOG.info("stopCluster");
}
+ @Ignore
@Test
public void testInterpreterProcess() throws IOException, InterruptedException {
InterpreterProcess interpreterProcess = new InterpreterProcess("python", "testInterpreterProcess", false);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@submarine.apache.org
For additional commands, e-mail: dev-help@submarine.apache.org