[wait mds] increase wait time of connect mds addr

Author: jackblack369

cli/command/cluster/remove.go

@@ -100,10 +100,16 @@ func runRemove(curveadm *cli.CurveAdm, options removeOptions) error {
 	//   2.3): delete cluster in database
 	if err := checkAllServicesRemoved(curveadm, options, clusters[0].Id); err != nil {
 		return err
-	} else if pass := tui.ConfirmYes(tui.PromptRemoveCluster(clusterName)); !pass {
+	}
+	// force stop
+	if !options.force && !tui.ConfirmYes(tui.PromptRemoveCluster(clusterName)) {
 		curveadm.WriteOut(tui.PromptCancelOpetation("remove cluster"))
 		return errno.ERR_CANCEL_OPERATION
-	} else if err := curveadm.Storage().DeleteCluster(clusterName); err != nil {
+	} else {
+		curveadm.WriteOut(tui.PromptRemoveCluster(clusterName))
+	}
+
+	if err := curveadm.Storage().DeleteCluster(clusterName); err != nil {
 		return errno.ERR_DELETE_CLUSTER_FAILED.E(err)
 	}
 

internal/configure/topology/dc.go

@@ -38,6 +38,7 @@ import (
 const (
 	KIND_CURVEBS = "curvebs"
 	KIND_CURVEFS = "curvefs"
+	KIND_DINGOFS = "dingofs"
 
 	ROLE_ETCD          = "etcd"
 	ROLE_MDS           = "mds"

internal/task/scripts/shell/wait.sh

@@ -8,17 +8,21 @@
 
 [[ -z $(which curl) ]] && apt-get install -y curl
 wait=0
-while ((wait<20))
+while ((wait<30))
 do
     for addr in "$@"
     do
-        curl --connect-timeout 3 --max-time 10 $addr -Iso /dev/null
+        echo "connect [$addr]..." >> /curvefs/tools/logs/wait.log
+        # curl --connect-timeout 3 --max-time 10 $addr -Iso /dev/null
+        curl -sfI --connect-timeout 3 --max-time 5 "$addr" > /dev/null 2>&1
         if [ $? == 0 ]; then
-           exit 0
+            echo "connect [$addr] success !" >> /curvefs/tools/logs/wait.log
+            exit 0
         fi
     done
-    sleep 0.5s
+    sleep 1s
     wait=$(expr $wait + 1)
+    date >> /curvefs/tools/logs/wait.log
 done
 echo "wait timeout"
 exit 1