From 066f64d34a5a6d274a1f6b905ce7f504abc3f519 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Mon, 21 Nov 2016 01:46:55 -0800
Subject: [PATCH] bootup: MetaVolume init should use isErrIngored helper.
 (#3303)

---
 cmd/fs-v1-background-append.go |  2 +-
 cmd/object-common.go           | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cmd/fs-v1-background-append.go b/cmd/fs-v1-background-append.go
index 8b103541c..0d03525ba 100644
--- a/cmd/fs-v1-background-append.go
+++ b/cmd/fs-v1-background-append.go
@@ -33,7 +33,7 @@ var errPartsMissing = errors.New("required parts missing")
 var errAppendPartsTimeout = errors.New("appendParts goroutine timeout")
 
 // Timeout value for the appendParts go-routine.
-var appendPartsTimeout = 24 * 60 * 60 * time.Second
+var appendPartsTimeout = 24 * 60 * 60 * time.Second // 24 hours.
 
 // Holds a map of uploadID->appendParts go-routine
 type backgroundAppend struct {
diff --git a/cmd/object-common.go b/cmd/object-common.go
index 2c9ca924d..4df66b923 100644
--- a/cmd/object-common.go
+++ b/cmd/object-common.go
@@ -194,6 +194,13 @@ func newStorageAPI(ep *url.URL) (storage StorageAPI, err error) {
 	return newStorageRPC(ep)
 }
 
+var initMetaVolIgnoredErrs = []error{
+	errVolumeExists,
+	errDiskNotFound,
+	errFaultyDisk,
+	errFaultyRemoteDisk,
+}
+
 // Initializes meta volume on all input storage disks.
 func initMetaVolume(storageDisks []StorageAPI) error {
 	// This happens for the first time, but keep this here since this
@@ -218,20 +225,14 @@ func initMetaVolume(storageDisks []StorageAPI) error {
 			// Attempt to create `.minio.sys`.
 			err := disk.MakeVol(minioMetaBucket)
 			if err != nil {
-				switch err {
-				// Ignored errors.
-				case errVolumeExists, errDiskNotFound, errFaultyDisk:
-				default:
+				if !isErrIgnored(err, initMetaVolIgnoredErrs) {
 					errs[index] = err
 				}
 				return
 			}
 			err = disk.MakeVol(minioMetaTmpBucket)
 			if err != nil {
-				switch err {
-				// Ignored errors.
-				case errVolumeExists, errDiskNotFound, errFaultyDisk:
-				default:
+				if !isErrIgnored(err, initMetaVolIgnoredErrs) {
 					errs[index] = err
 				}
 				return