SUBMARINE-292. Merge workbench server into submarine server #93
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yuanzac
reviewed
Nov 18, 2019
bin/submarine-daemon.sh
Outdated
| return 1; | ||
| fi | ||
| } | ||
|
|
||
| function stop() { | ||
| local pid | ||
| pid=`found_workbench_server_pid` | ||
| pid=`found_submarine_server_server_pid` |
There was a problem hiding this comment.
Is it better to use found_submarine_server_pid?
| @@ -94,7 +94,7 @@ public static SubmarineConfiguration getInstance() { | |||
| return conf; | |||
| } | |||
|
|
|||
| public static SubmarineConfiguration newInstance() { | |||
| private static SubmarineConfiguration newInstance() { | |||
There was a problem hiding this comment.
As every session can have its own configuration for user, so newInstance should be public
|
|
||
| public class JobApiTest { //extends JerseyTest { | ||
| /* |
There was a problem hiding this comment.
Why do we need to comment on this test class? The test cases are not running after this modification
There was a problem hiding this comment.
The test cases have no practical meaning.
I created new JIRA SUBMARINE-293. Add submarine server rest test case
| @@ -30,7 +30,7 @@ | |||
|
|
|||
| <artifactId>submitter-k8s</artifactId> | |||
| <version>0.3.0-SNAPSHOT</version> | |||
| <name>Submarine: Kubernetes Submitter</name> | |||
| <name>Submarine: Submitter Kubernetes</name> | |||
There was a problem hiding this comment.
Is it better to use Kubernetes Submitter?
| @@ -26,7 +26,7 @@ | |||
|
|
|||
| <artifactId>submitter-yarn</artifactId> | |||
| <version>0.3.0-SNAPSHOT</version> | |||
| <name>Submarine: Server Submitter for YARN</name> | |||
| <name>Submarine: Submitter YARN</name> | |||
There was a problem hiding this comment.
Is it better to use Yarn Submitter?
| @@ -30,7 +30,7 @@ | |||
|
|
|||
| <artifactId>submitter-yarnservice</artifactId> | |||
| <version>0.3.0-SNAPSHOT</version> | |||
| <name>Submarine: Server Submitter for YARN Service</name> | |||
| <name>Submarine: Submitter YARN Service</name> | |||
There was a problem hiding this comment.
Is it better to use Yarn Service Submitter?
|
@yuanzac , Thank you help me review, I fixed there issue on your suggestion. |
|
Thanks, @liuxunorg for your contribution. |
kevin85421
pushed a commit
to kevin85421/hadoop-submarine
that referenced
this pull request
Nov 26, 2019
### What is this PR for? Now submarine has 2 services, submarine server and workbench server. These two services have no conflicts. Originally divided into two services, it is for the development of sub-modules, easy to develop. But this way 1. Users need to maintain two service processes, which increases the cost of use and maintenance of users and administrators. 2. Because we need to be able to run the service on multiple resource scheduling systems(YARN/K8s/Docker), the two services create the complexity of the launcher module. So, now the service in the workbench server is migrated to the submarine server. But the code for the workbench server remains the same. ### What type of PR is it? Refactoring ### Todos * [ ] [SUBMARINE-293](https://issues.apache.org/jira/browse/SUBMARINE-293) - Add submarine server rest test case ### What is the Jira issue? * https://issues.apache.org/jira/browse/SUBMARINE-292 ### How should this be tested? * [CI Pass](https://travis-ci.org/liuxunorg/submarine/builds/613280558) ### Screenshots (if appropriate) ``` |____bin | |____common.sh | |____submarine-daemon.sh | |____submarine-env.sh |____commons-runtime-0.3.0-SNAPSHOT.jar |____conf | |____log4j.properties | |____log4j.properties.template | |____submarine-env.sh.template | |____submarine-site.xml | |____submarine-site.xml.template |____lib | |____bcpg-jdk15on-1.61.jar | |____bcpkix-jdk15on-1.61.jar | |____hk2-utils-2.5.0-b42.jar | |____interpreter | | |____python | | | |____python-interpreter-0.3.0-SNAPSHOT-shade.jar | | |____spark | | | |____scala-2.11 | | | | |____spark-scala-2.11-0.9.0-SNAPSHOT.jar | | | |____spark-interpreter-0.3.0-SNAPSHOT-shade.jar | |____j2objc-annotations-1.1.jar | |____jackson-annotations-2.9.10.jar | |____websocket-server-9.4.18.v20190429.jar | |____workbench | | |____workbench-web.war |____LICENSE |____licenses | |____LICENSE-asm.txt | |____LICENSE-hamcrest.txt | |____LICENSE-slf4j.txt | |____LICENSE-tony.txt |____logs | |____submarine.log |____NOTICE |____server |____submarine-all-0.3.0-SNAPSHOT-hadoop-2.9.jar |____submarine-client-0.3.0-SNAPSHOT.jar |____submitter-yarn-0.3.0-SNAPSHOT.jar |____tony-core-0.3.21.jar ``` ### Questions: * Does the licenses files need update? Yes/No * Is there breaking changes for older versions? Yes/No * Does this needs documentation? Yes/No Author: Xun Liu <liuxun@apache.org> Closes apache#93 from liuxunorg/SUBMARINE-292 and squashes the following commits: aa5508b [Xun Liu] Fixed some issue. 47f30da [Xun Liu] SUBMARINE-292. Merge workbench server into submarine server
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this PR for?
Now submarine has 2 services, submarine server and workbench server. These two services have no conflicts.
Originally divided into two services, it is for the development of sub-modules, easy to develop.
But this way
So, now the service in the workbench server is migrated to the submarine server. But the code for the workbench server remains the same.
What type of PR is it?
Refactoring
Todos
What is the Jira issue?
How should this be tested?
Screenshots (if appropriate)
Questions: