From 3d47c38262c6e3194e5a9b73c66a00ff3320208a Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 14 Dec 2020 01:05:20 -0800 Subject: [PATCH] collection.delete requires _default_ as the default empty collection name fix https://github.com/chrislusf/seaweedfs/issues/1677 --- weed/shell/command_collection_delete.go | 12 ++++++++++-- 1 file 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 }