gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

collection.delete requires _default_ as the default empty collection name

Browse source 
fix https://github.com/chrislusf/seaweedfs/issues/1677
This commit is contained in:
Chris Lu 2020-12-14 01:05:20 -08:00
parent b7e3ca9172
commit 3d47c38262
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
weed/shell/command_collection_delete.go
View file

@ -34,14 +34,22 @@ func (c *commandCollectionDelete) Do(args []string, commandEnv *CommandEnv, writ
} }
colDeleteCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError) 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") applyBalancing := colDeleteCommand.Bool("force", false, "apply the collection")
if err = colDeleteCommand.Parse(args); err != nil { if err = colDeleteCommand.Parse(args); err != nil {
return nil return nil
} }
if *collectionName == "" {
return fmt.Errorf("empty collection name is not allowed")
}
if *collectionName == "_default_" {
*collectionName = ""
}
if !*applyBalancing { 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 return nil
} }