maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

AddNode fails with proper error code when bucketid is malformed

Browse source
This commit is contained in:
Frederick F. Kautz IV 2015-03-26 10:02:40 -07:00
parent 8cf66ede66
commit 70a2217eb2
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/storage/donut/bucket.go
View file

@ -23,12 +23,10 @@ func (b donutBucket) GetNodes() ([]string, error) {
// AddNode - adds a node to a bucket // AddNode - adds a node to a bucket
func (b donutBucket) AddNode(nodeID, bucketID string) error { func (b donutBucket) AddNode(nodeID, bucketID string) error {
errParams := map[string]string{"node": nodeID, "bucketID": bucketID}
tokens := strings.Split(bucketID, ":") tokens := strings.Split(bucketID, ":")
if len(tokens) != 3 { if len(tokens) != 3 {
var err error return iodine.Error(errors.New("Bucket ID malformeD: "+bucketID), errParams)
err = iodine.Error(nil, nil)
return err
// return iodine.Error(errors.New("Bucket ID malformed: "+bucketID), map[string]string{"nodeID": nodeID, "bucketID": bucketID})
} }
// bucketName := tokens[0] // bucketName := tokens[0]
@ -36,7 +34,7 @@ func (b donutBucket) AddNode(nodeID, bucketID string) error {
// aggregate := "0" // aggregate := "0"
part, err := strconv.Atoi(tokens[2]) part, err := strconv.Atoi(tokens[2])
if err != nil { if err != nil {
return iodine.Error(errors.New("Part malformed: "+tokens[2]), map[string]string{"nodeID": nodeID, "bucketID": bucketID}) return iodine.Error(errors.New("Part malformed: "+tokens[2]), errParams)
} }
b.nodes[part] = nodeID b.nodes[part] = nodeID
return nil return nil