FS: check whether disk format is FS or not. (#2083)

Fixes #2060
This commit is contained in:
Bala FA
2016-07-04 08:31:40 +05:30
committed by Harshavardhana
parent 355f06cfea
commit 52b55afce0
4 changed files with 55 additions and 4 deletions
+3 -1
View File
@@ -103,7 +103,7 @@ func newFSObjects(disk string) (ObjectLayer, error) {
// loading format.json from minioMetaBucket.
// Note: The format.json content is ignored, reserved for future use.
_, err = loadFormatFS(storage)
format, err := loadFormatFS(storage)
if err != nil {
if err == errFileNotFound {
// format.json doesn't exist, create it inside minioMetaBucket.
@@ -114,6 +114,8 @@ func newFSObjects(disk string) (ObjectLayer, error) {
} else {
return nil, err
}
} else if !isFSFormat(format) {
return nil, errFSDiskFormat
}
// Register the callback that should be called when the process shuts down.