Use external package disk for donut.

This commit is contained in:
Harshavardhana
2015-06-24 20:34:20 -07:00
parent 841ff01412
commit a2c205ff2e
8 changed files with 49 additions and 55 deletions

View File

@@ -16,7 +16,10 @@
package donut
import "github.com/minio/minio/pkg/iodine"
import (
"github.com/minio/minio/pkg/iodine"
"github.com/minio/minio/pkg/storage/donut/disk"
)
// donut struct internal data
type donut struct {
@@ -47,16 +50,17 @@ func (d donut) attachDonutNode(hostname string, disks []string) error {
if err != nil {
return iodine.New(err, nil)
}
for i, disk := range disks {
donutName := d.name
for i, d := range disks {
// Order is necessary for maps, keep order number separately
newDisk, err := NewDisk(disk, i)
newDisk, err := disk.New(d)
if err != nil {
return iodine.New(err, nil)
}
if err := newDisk.MakeDir(d.name); err != nil {
if err := newDisk.MakeDir(donutName); err != nil {
return iodine.New(err, nil)
}
if err := node.AttachDisk(newDisk); err != nil {
if err := node.AttachDisk(newDisk, i); err != nil {
return iodine.New(err, nil)
}
}