MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change distributed server wording.

Browse Source
This commit is contained in:
Harshavardhana 2016-09-09 15:32:08 -07:00
parent eae0281c64
commit 43befab8ef
4 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/bucket-handlers.go
View File

@ -291,7 +291,7 @@ func (api objectAPIHandlers) DeleteMultipleObjectsHandler(w http.ResponseWriter,
deletedObjects = append(deletedObjects, object) deletedObjects = append(deletedObjects, object)
continue continue
} }
if _, ok := err.(ObjectNotFound); ok { if _, ok := errorCause(err).(ObjectNotFound); ok {
// If the object is not found it should be // If the object is not found it should be
// accounted as deleted as per S3 spec. // accounted as deleted as per S3 spec.
deletedObjects = append(deletedObjects, object) deletedObjects = append(deletedObjects, object)

21
cmd/format-config-v1_test.go
View File

@ -262,8 +262,13 @@ func prepareFormatXLHealFreshDisks(obj ObjectLayer) ([]StorageAPI, error) {
} }
func TestFormatXLHealFreshDisks(t *testing.T) { func TestFormatXLHealFreshDisks(t *testing.T) {
nDisks := 16
fsDirs, err := getRandomDisks(nDisks)
if err != nil {
t.Fatal(err)
}
// Create an instance of xl backend. // Create an instance of xl backend.
obj, fsDirs, err := getXLObjectLayer() obj, err := getXLObjectLayer(fsDirs)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@ -289,8 +294,13 @@ func TestFormatXLHealFreshDisks(t *testing.T) {
} }
func TestFormatXLHealFreshDisksErrorExpected(t *testing.T) { func TestFormatXLHealFreshDisksErrorExpected(t *testing.T) {
nDisks := 16
fsDirs, err := getRandomDisks(nDisks)
if err != nil {
t.Fatal(err)
}
// Create an instance of xl backend. // Create an instance of xl backend.
obj, fsDirs, err := getXLObjectLayer() obj, err := getXLObjectLayer(fsDirs)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@ -568,8 +578,13 @@ func TestSavedUUIDOrder(t *testing.T) {
// Test initFormatXL() when disks are expected to return errors // Test initFormatXL() when disks are expected to return errors
func TestInitFormatXLErrors(t *testing.T) { func TestInitFormatXLErrors(t *testing.T) {
nDisks := 16
fsDirs, err := getRandomDisks(nDisks)
if err != nil {
t.Fatal(err)
}
// Create an instance of xl backend. // Create an instance of xl backend.
obj, fsDirs, err := getXLObjectLayer() obj, err := getXLObjectLayer(fsDirs)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

9
cmd/naughty-disk_test.go
View File

@ -16,6 +16,8 @@
package cmd package cmd
import "github.com/minio/minio/pkg/disk"
// naughtyDisk wraps a POSIX disk and returns programmed errors // naughtyDisk wraps a POSIX disk and returns programmed errors
// specified by the developer. The purpose is to simulate errors // specified by the developer. The purpose is to simulate errors
// that are hard to simulate in practise like DiskNotFound. // that are hard to simulate in practise like DiskNotFound.
@ -46,6 +48,13 @@ func (d *naughtyDisk) calcError() (err error) {
return nil return nil
} }
func (d *naughtyDisk) DiskInfo() (info disk.Info, err error) {
if err := d.calcError(); err != nil {
return info, err
}
return d.disk.DiskInfo()
}
func (d *naughtyDisk) MakeVol(volume string) (err error) { func (d *naughtyDisk) MakeVol(volume string) (err error) {
if err := d.calcError(); err != nil { if err := d.calcError(); err != nil {
return err return err

3
cmd/server-main.go
View File

@ -85,8 +85,7 @@ EXAMPLES:
/mnt/export3/ /mnt/export4/ /mnt/export5/ /mnt/export6/ /mnt/export7/ \ /mnt/export3/ /mnt/export4/ /mnt/export5/ /mnt/export6/ /mnt/export7/ \
/mnt/export8/ /mnt/export9/ /mnt/export10/ /mnt/export11/ /mnt/export12/ /mnt/export8/ /mnt/export9/ /mnt/export10/ /mnt/export11/ /mnt/export12/
6. Start minio server with 4 remote disks on all remote nodes. You need to execute the same command on all nodes 6. Start minio server on a 4 node distributed setup. Type the following command on all the 4 nodes.
192.168.1.11, 192.168.1.12, 192.168.1.13 and 192.168.1.14.
$ export MINIO_ACCESS_KEY=minio $ export MINIO_ACCESS_KEY=minio
$ export MINIO_SECRET_KEY=miniostorage $ export MINIO_SECRET_KEY=miniostorage
$ minio {{.Name}} 192.168.1.11:/mnt/export/ 192.168.1.12:/mnt/export/ \ $ minio {{.Name}} 192.168.1.11:/mnt/export/ 192.168.1.12:/mnt/export/ \