Merge 8a37823 into abd147a

pingcap · Sep 6, 2021 · b314668 · b314668
2 parents abd147a + 8a37823
commit b314668
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/components/cluster/command/prune.go b/components/cluster/command/prune.go
@@ -34,5 +34,7 @@ func newPruneCmd() *cobra.Command {
 		},
 	}
 
+	cmd.Flags().BoolVar(&gOpt.Force, "force", false, "Ignore errors when deleting the instance with data from the cluster")
+
 	return cmd
 }
diff --git a/pkg/cluster/operation/destroy.go b/pkg/cluster/operation/destroy.go
@@ -488,7 +488,12 @@ func DestroyClusterTombstone(
 			instCount[instance.GetHost()]--
 			err := StopAndDestroyInstance(ctx, cluster, instance, options, instCount[instance.GetHost()] == 0)
 			if err != nil {
-				return err
+				if options.Force {
+					log.Warnf("failed to stop and destroy instance %s (%s), ignored as --force is set, you may need to manually cleanup the files",
+						instance, err)
+				} else {
+					return err
+				}
 			}
 		}
 		return nil
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,5 +34,7 @@ func newPruneCmd() *cobra.Command { @@
     		},
     	}
+    	cmd.Flags().BoolVar(&gOpt.Force, "force", false, "Ignore errors when deleting the instance with data from the cluster")
     	return cmd
     }