run word count success

huihui7987 · Jun 12, 2016 · 817a72f · 817a72f
1 parent a37c5cb
commit 817a72f
Show file tree

Hide file tree

Showing 28 changed files with 8 additions and 422 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1 @@
-
-hadoop-base/files/hadoop-2.3.0.tar.gz
+.DS_Store
diff --git a/Dockerfile b/Dockerfile
@@ -46,9 +46,7 @@ RUN /usr/local/hadoop/bin/hdfs namenode -format
 
 WORKDIR /root
 
-EXPOSE 8025 8030 8050 8040 8088 50070
+# EXPOSE 8030 8031 8032 8033 8040 8042 8060 8088 9000 50010 50020 50060 50070 50075 50090 50475
 
 CMD [ "sh", "-c", "service ssh start; bash"]
 
-
-
diff --git a/build-image.sh b/build-image.sh
@@ -1,20 +1,6 @@
 #!/bin/bash
 
-# echo -e "\nbuild docker hadoop-base image\n"
-# sudo docker build -f hadoop-base/Dockerfile -t kiwenlau/hadoop-base:1.0 ./hadoop-base
-
-# echo ""
-
-
-# echo -e "\nbuild docker hadoop-master image\n"
-# sudo docker build -f hadoop-master/Dockerfile -t kiwenlau/hadoop-master:1.0 ./hadoop-master
-
-# echo ""
-
-# echo -e "\nbuild docker hadoop-slave image\n"
-# sudo docker build -f hadoop-slave/Dockerfile -t kiwenlau/hadoop-slave:1.0 ./hadoop-slave
-
-# echo ""
+echo ""
 
 echo -e "\nbuild docker hadoop image\n"
 sudo docker build -t kiwenlau/hadoop:1.0 .

diff --git a/config/core-site.xml b/config/core-site.xml
@@ -3,6 +3,5 @@
     <property>
         <name>fs.defaultFS</name>
         <value>hdfs://hadoop-master:9000/</value>
-        <description>NameNode URI</description>
     </property>
 </configuration>
diff --git a/config/run-wordcount.sh b/config/run-wordcount.sh
@@ -26,3 +26,4 @@ hdfs dfs -cat input/file2.txt
 # print the output of wordcount
 echo -e "\nwordcount output:"
 hdfs dfs -cat output/part-r-00000
+
diff --git a/config/yarn-site.xml b/config/yarn-site.xml
@@ -8,4 +8,8 @@
         <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name>
         <value>org.apache.hadoop.mapred.ShuffleHandler</value>
     </property>
+    <property>
+        <name>yarn.resourcemanager.hostname</name>
+        <value>hadoop-master</value>
+    </property>
 </configuration>
diff --git a/hadoop-base/.DS_Store b/hadoop-base/.DS_Store
diff --git a/hadoop-base/Dockerfile b/hadoop-base/Dockerfile
diff --git a/hadoop-base/config/.DS_Store b/hadoop-base/config/.DS_Store
diff --git a/hadoop-base/config/.bashrc b/hadoop-base/config/.bashrc
diff --git a/hadoop-base/config/hadoop-env.sh b/hadoop-base/config/hadoop-env.sh
diff --git a/hadoop-base/config/ssh_config b/hadoop-base/config/ssh_config
diff --git a/hadoop-master/.DS_Store b/hadoop-master/.DS_Store
diff --git a/hadoop-master/Dockerfile b/hadoop-master/Dockerfile
diff --git a/hadoop-master/files/.DS_Store b/hadoop-master/files/.DS_Store
diff --git a/hadoop-master/files/core-site.xml b/hadoop-master/files/core-site.xml
diff --git a/hadoop-master/files/hdfs-site.xml b/hadoop-master/files/hdfs-site.xml
diff --git a/hadoop-master/files/mapred-site.xml b/hadoop-master/files/mapred-site.xml
diff --git a/hadoop-master/files/run-wordcount.sh b/hadoop-master/files/run-wordcount.sh
diff --git a/hadoop-master/files/slaves b/hadoop-master/files/slaves
diff --git a/hadoop-master/files/start-hadoop.sh b/hadoop-master/files/start-hadoop.sh
diff --git a/hadoop-master/files/yarn-site.xml b/hadoop-master/files/yarn-site.xml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,3 +26,4 @@ hdfs dfs -cat input/file2.txt
		# print the output of wordcount
		echo -e "\nwordcount output:"
		hdfs dfs -cat output/part-r-00000