refactory code and add killme in backend

Author: codeboyyong

README.md

@@ -1,4 +1,4 @@
-distrbuted-shell
+distributed-shell
 ================
 
 A real distributed shell for yarn 
@@ -8,7 +8,7 @@ simple usgae:
 1) mvn package
 2) export HADOOP_YARN_HOME=/apache2.2.0/hadoop-2.2.0
   export HADOOP_VERSION=2.2.0
-3) cp ./target/distributed-shell-1.0-SNAPSHOT.jar $HADOOP_YARN_HOME
+3) cp ./target/distributed-shell-0.1.jar $HADOOP_YARN_HOME
 4) cd $HADOOP_YARN_HOME
 
 ### Unmanaged mode
@@ -28,7 +28,7 @@ $ bin/hadoop jar distributed-shell-1.0-SNAPSHOT.jar com.hortonworks.simpleyarnap
 
 
 Use mvn eclipse:eclipse to generate eclipse project
-Currently this is only developed and tested in Mac os X10.9
+Currently this is only developed and tested in Mac os X10.9 with Eclipse 4.2
 
 ### how to test webshell
 `mvn exec:java -Dexec.mainClass=com.codeboy.dshell.webshell.WebShellServer`

src/main/java/com/codeboy/dshell/ApplicationMaster.java

@@ -6,8 +6,6 @@
 import org.apache.hadoop.yarn.client.api.NMClient;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 
-import com.codeboy.dshell.webshell.WebShellServer;
-
 public class ApplicationMaster {
 
 	private static final ApplicationMaster INSTANCE = new ApplicationMaster(); 
@@ -20,12 +18,13 @@ public static void main(String[] args) throws Exception {
 		ApplicationMaster.INSTANCE.start(args);
 	}
 
+	
 	private void start(String[] args) throws Exception {
-		final String command = args[0];
-		final int n = Integer.valueOf(args[1]);
-
+		final String port = args[0];
+ 
 		// Initialize clients to ResourceManager and NodeManagers
 		Configuration conf = new YarnConfiguration();
+		
 		// talk to resource manager
 		AMRMClient<ContainerRequest> rmClient = AMRMClient.createAMRMClient();
 		rmClient.init(conf);
@@ -41,9 +40,11 @@ private void start(String[] args) throws Exception {
 		// registerApplicationMaster
 		// resourceManager.registerApplicationMaster(appMasterHostname,
 		// appMasterRpcPort, appMasterTrackingUrl);
-		WebShellServer.INTANCE.start();
+		//start the web shell server
+		ApplicationMasterTrackingUI.startWebShellServer();
 
-		rmClient.registerApplicationMaster(WebShellServer.AM_HOST, WebShellServer.AM_PORT, WebShellServer.URL);
+		rmClient.registerApplicationMaster(ApplicationMasterTrackingUI.AM_HOST, 
+				ApplicationMasterTrackingUI.AM_TRACKING_PORT, ApplicationMasterTrackingUI.AM_TRACKING_URL);
 		// System.out.println("registerApplicationMaster 1");
 		// rmClient.registerApplicationMaster("", 1, "");
 

src/main/java/com/codeboy/dshell/Client.java renamed to src/main/java/com/codeboy/dshell/ApplicationMasterClient.java

@@ -29,7 +29,7 @@
 import org.apache.hadoop.yarn.util.Records;
 
 
-public class Client {	
+public class ApplicationMasterClient {	
 
   Configuration conf = new YarnConfiguration();
 
@@ -131,7 +131,7 @@ private void setupAppMasterEnv(Map<String, String> appMasterEnv) {
   }
 
   public static void main(String[] args) throws Exception {
-    Client c = new Client();
+    ApplicationMasterClient c = new ApplicationMasterClient();
     c.run(args);
   }
 }

src/main/java/com/codeboy/dshell/ApplicationMasterTrackingUI.java

@@ -0,0 +1,24 @@
+package com.codeboy.dshell;
+
+import com.codeboy.dshell.common.MasterNode;
+import com.codeboy.dshell.webshell.WebShellServer;
+
+
+public class ApplicationMasterTrackingUI {
+
+	public static final String AM_HOST = "localhost";
+
+	public static final int AM_TRACKING_PORT = 8898;
+	
+	public static final String AM_TRACKING_PATH = "/distributedshell";
+
+	public static final String AM_TRACKING_URL = AM_HOST + ":" + AM_TRACKING_PORT + AM_TRACKING_PATH;
+
+	//one jvm , one instance
+	public static void startWebShellServer() throws Exception { 
+		MasterNode masterNode= new MasterNode(AM_TRACKING_PATH,AM_HOST,AM_TRACKING_PORT+"",System.getProperty("user.name"));
+		new WebShellServer(masterNode).start();     
+	}
+	
+ 
+}

src/main/java/com/codeboy/dshell/common/DistributedNode.java

@@ -4,16 +4,12 @@ public class DistributedNode {
 
 	String host;
 	String port;
-	String shellServiceURLPath;
-
 	String userName;
 
-	public DistributedNode(String host, String port,
-			String shellServiceURLPath, String userName) {
+	public DistributedNode(String host, String port,  String userName) {
 		super();
 		this.host = host;
 		this.port = port;
-		this.shellServiceURLPath = shellServiceURLPath;
 		this.userName = userName;
 	}
 
@@ -33,14 +29,6 @@ public void setPort(String port) {
 		this.port = port;
 	}
 
-	public String getShellServiceURLPath() {
-		return shellServiceURLPath;
-	}
-
-	public void setShellServiceURLPath(String shellServiceURLPath) {
-		this.shellServiceURLPath = shellServiceURLPath;
-	}
-
 	public String getUserName() {
 		return userName;
 	}

src/main/java/com/codeboy/dshell/common/MasterNode.java

@@ -0,0 +1,21 @@
+package com.codeboy.dshell.common;
+
+public class MasterNode extends DistributedNode {
+
+	private String mainPageURLPath;
+
+	public MasterNode(String mainPageURLPath, String host, String port ,String userName) {
+		super(host, port,  userName);
+		this.mainPageURLPath = mainPageURLPath;
+	}
+
+	// like /distributedpath
+	public String getMainPageURLPath() {
+		return mainPageURLPath;
+	}
+
+	// like localhost:8898/distributedpath
+	public String getMainPageURL() {
+		return getHttpBaseURL()+ mainPageURLPath;
+	}
+}