Index: nutchez-0.2/src/shell/master_remove.sh
===================================================================
--- nutchez-0.2/src/shell/master_remove.sh	(revision 220)
+++ nutchez-0.2/src/shell/master_remove.sh	(revision 222)
@@ -45,6 +45,18 @@
   for nutch_node in $slaves_list
   do
-    su nutchuser -c "ssh nutchuser@$nutch_node /opt/nutchez/nutch/bin/hadoop-daemon.sh stop datanode"
-    su nutchuser -c "ssh nutchuser@$nutch_node /opt/nutchez/nutch/bin/hadoop-daemon.sh stop tasktracker"
+    show_info "驗證叢集狀態"
+    TaskTrackerStatus=`ssh -o StrictHostKeyChecking=no $nutch_node "jps |grep TaskTracker |sed 's/[0-9]* //g'"`
+    DataNodeStatus=`ssh -o StrictHostKeyChecking=no $nutch_node "jps |grep DataNode |sed 's/[0-9]* //g'"`
+
+    if [ $TaskTrackerStatus == "TaskTracker" ]; then
+       show_info "TaskTracker@$nutch_node is running, we will shutdown it!"
+       su nutchuser -c "ssh nutchuser@$nutch_node /opt/nutchez/nutch/bin/hadoop-daemon.sh stop tasktracker"
+    fi
+
+    if [ $DataNodeStatus == "DataNode" ]; then
+       show_info "DataNode@$nutch_node is running, we will shutdown it!"
+       show_info "Shutdown $nutch_node."
+       su nutchuser -c "ssh nutchuser@$nutch_node /opt/nutchez/nutch/bin/hadoop-daemon.sh stop datanode"
+    fi
   done
   show_info "$MR_shutdown_service_echo_2" # "關閉本機服務..."