refine code

codeboyyong · codeboyyong · commit adf24d43bc96 · 2014-07-12T10:33:10.000-07:00
diff --git a/hadoop-installtion/conf/2.3.0-cdh5.0.0/core-site.xml b/hadoop-installtion/conf/2.3.0-cdh5.0.0/core-site.xml
@@ -4,11 +4,11 @@
 <configuration>
 <property>
     <name>fs.default.name</name>
-    <value>hdfs://ALPINE_HADOOP_HOST:9000</value>
+    <value>hdfs://HADOOP_HOST:9000</value>
 </property>
 <property>
      <name>hadoop.tmp.dir</name>
-     <value>ALPINE_HADOOP_HOME/tmp</value>
+     <value>HADOOP_HOME/tmp</value>
 </property>
 </configuration>
 
diff --git a/hadoop-installtion/conf/2.3.0-cdh5.0.0/hdfs-site.xml b/hadoop-installtion/conf/2.3.0-cdh5.0.0/hdfs-site.xml
@@ -4,12 +4,12 @@
 <configuration>
         <property>
             <name>dfs.name.dir</name>
-            <value>ALPINE_HADOOP_HOME/name</value>
+            <value>HADOOP_HOME/name</value>
         </property>
 
         <property>
             <name>dfs.data.dir</name>
-            <value>ALPINE_HADOOP_HOME/data</value>
+            <value>HADOOP_HOME/data</value>
         </property>
 
         <property>
diff --git a/hadoop-installtion/conf/2.3.0-cdh5.0.0/mapred-site.xml b/hadoop-installtion/conf/2.3.0-cdh5.0.0/mapred-site.xml
@@ -6,7 +6,7 @@
 <configuration>
   <property>
     <name>mapreduce.cluster.temp.dir</name>
-    <value>ALPINE_HADOOP_HOME/tmp</value>
+    <value>HADOOP_HOME/tmp</value>
     <final>true</final>
   </property>
 
diff --git a/hadoop-installtion/conf/2.3.0-cdh5.0.0/yarn-site.xml b/hadoop-installtion/conf/2.3.0-cdh5.0.0/yarn-site.xml
@@ -4,23 +4,23 @@
 
 <property>
     <name>yarn.resourcemanager.resource-tracker.address</name>
-    <value>ALPINE_HADOOP_HOST:8031</value>
+    <value>HADOOP_HOST:8031</value>
   </property>
   <property>
     <name>yarn.resourcemanager.address</name>
-    <value>ALPINE_HADOOP_HOST:8032</value>
+    <value>HADOOP_HOST:8032</value>
   </property>
   <property>
     <name>yarn.resourcemanager.scheduler.address</name>
-    <value>ALPINE_HADOOP_HOST:8030</value>
+    <value>HADOOP_HOST:8030</value>
   </property>
   <property>
     <name>yarn.resourcemanager.admin.address</name>
-    <value>ALPINE_HADOOP_HOST:8033</value>
+    <value>HADOOP_HOST:8033</value>
   </property>
   <property>
     <name>yarn.resourcemanager.webapp.address</name>
-    <value>ALPINE_HADOOP_HOST:8088</value>
+    <value>HADOOP_HOST:8088</value>
   </property>
   <property>
     <description>Classpath for typical applications.</description>
@@ -49,15 +49,15 @@
   </property>
   <property>
     <name>yarn.nodemanager.local-dirs</name>
-    <value>ALPINE_HADOOP_HOME/data/1/yarn/local</value>
+    <value>HADOOP_HOME/data/1/yarn/local</value>
   </property>
   <property>
     <name>yarn.nodemanager.log-dirs</name>
-    <value>ALPINE_HADOOP_HOME/data/1/yarn/logs</value>
+    <value>HADOOP_HOME/data/1/yarn/logs</value>
   </property>
   <property>
     <description>Where to aggregate logs</description>
     <name>yarn.nodemanager.remote-app-log-dir</name>
-    <value>ALPINE_HADOOP_HOME/data/1/logs/apps</value>
+    <value>HADOOP_HOME/data/1/logs/apps</value>
   </property>
 </configuration>
diff --git a/hadoop-installtion/installation.config b/hadoop-installtion/installation.config
diff --git a/hadoop-installtion/script/bin/install-hadoop.sh b/hadoop-installtion/script/bin/install-hadoop.sh
@@ -4,7 +4,7 @@
 #$1 :HADOOP_HOST=localhost
 #$2 :HADOOP_VERSION=2.3.0-cdh5.0.0
 #$3 :HADOOP_URL=http://archive.cloudera.com/cdh5/cdh/5/hadoop-2.3.0-cdh5.0.0.tar.gz
-#$4 :HADOOP_HOME=~/alpinehadoop
+#$4 :HADOOP_HOME=~/hadoop-install
 #$5 :HADOOP_INSTALL=/Users/zhaoyong/dev/adl_new/HadoopInstallation/
 
 if [ "$1" != "" ]
diff --git a/hadoop-installtion/script/bin/start-hadoop.sh b/hadoop-installtion/script/bin/start-hadoop.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #This command need 2 input
-#HADOOP_DIR = ~/alpinehadoop/hadoop-2.3.0-cdh5
+#HADOOP_DIR = ~/hadoop-install/hadoop-2.3.0-cdh5
 #HADOOP_ISYARN=true
 
 if [ "$1" != "" ]
diff --git a/hadoop-installtion/script/bin/stop-hadoop.sh b/hadoop-installtion/script/bin/stop-hadoop.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #This command need 2 input
-#HADOOP_DIR = ~/alpinehadoop/hadoop-2.3.0-cdh5
+#HADOOP_DIR = ~/hadoop-install/hadoop-2.3.0-cdh5
 #HADOOP_ISYARN=true
 
 if [ "$1" != "" ]
diff --git a/hadoop-installtion/script/start-hadoop.sh b/hadoop-installtion/script/start-hadoop.sh
@@ -1,3 +1,12 @@
 #!/bin/sh
+#$1 :HADOOP_HOST=localhost
+#$2 :HADOOP_VERSION=2.3.0-cdh5.0.0
+#$3 :HADOOP_URL=http://archive.cloudera.com/cdh5/cdh/5/hadoop-2.3.0-cdh5.0.0.tar.gz
+#$4 :HADOOP_HOME=~/hadoop-installation
 
-./bin/start-hadoop.sh  ~/alpinehadoop/hadoop-2.3.0-cdh5 true
+if [ "$3" != "" ]
+then
+    ./bin/install-hadoop.sh 
+fi
+
+./bin/start-hadoop.sh  ~/hadoop-install/hadoop-2.3.0-cdh5 true
diff --git a/hadoop-installtion/script/stop-hadoop.sh b/hadoop-installtion/script/stop-hadoop.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-./bin/stop-hadoop.sh  ~/alpinehadoop/hadoop-2.3.0-cdh5 true
+./bin/stop-hadoop.sh  ~/hadoop-install/hadoop-2.3.0-cdh5 true

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/sh`
`2`		`-./bin/stop-hadoop.sh ~/alpinehadoop/hadoop-2.3.0-cdh5 true`
	`2`	`+./bin/stop-hadoop.sh ~/hadoop-install/hadoop-2.3.0-cdh5 true`