aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-12-14 01:05:20 -0800
committerChris Lu <chris.lu@gmail.com>2020-12-14 01:05:20 -0800
commit3d47c38262c6e3194e5a9b73c66a00ff3320208a (patch)
tree45a0af4e9bcd00a6372613b56ac27730c9951924
parentb7e3ca91727d6ad12f99aa7fd18ad23e13875f6c (diff)
downloadseaweedfs-3d47c38262c6e3194e5a9b73c66a00ff3320208a.tar.xz
seaweedfs-3d47c38262c6e3194e5a9b73c66a00ff3320208a.zip
collection.delete requires _default_ as the default empty collection name
fix https://github.com/chrislusf/seaweedfs/issues/1677
-rw-r--r--weed/shell/command_collection_delete.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/weed/shell/command_collection_delete.go b/weed/shell/command_collection_delete.go
index 5777d5780..e43f2a093 100644
--- a/weed/shell/command_collection_delete.go
+++ b/weed/shell/command_collection_delete.go
@@ -34,14 +34,22 @@ func (c *commandCollectionDelete) Do(args []string, commandEnv *CommandEnv, writ
}
colDeleteCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
- collectionName := colDeleteCommand.String("collection", "", "collection to delete")
+ collectionName := colDeleteCommand.String("collection", "", "collection to delete. Use '_default_' for the empty-named collection.")
applyBalancing := colDeleteCommand.Bool("force", false, "apply the collection")
if err = colDeleteCommand.Parse(args); err != nil {
return nil
}
+ if *collectionName == "" {
+ return fmt.Errorf("empty collection name is not allowed")
+ }
+
+ if *collectionName == "_default_" {
+ *collectionName = ""
+ }
+
if !*applyBalancing {
- fmt.Fprintf(writer, "collection %s will be deleted. Use -force to apply the change.\n", *collectionName)
+ fmt.Fprintf(writer, "collection '%s' will be deleted. Use -force to apply the change.\n", *collectionName)
return nil
}