backend/fs: More cleanup and start using checkBuckeArg. (#1306)

backend/fs: More cleanup and start using checkBucketArg.

fs.go

@@ -17,8 +17,11 @@
 package main
 
 import (
+	"os"
+	"path/filepath"
 	"sync"
 
+	"github.com/minio/minio/pkg/disk"
 	"github.com/minio/minio/pkg/probe"
 )
 
@@ -41,7 +44,7 @@ type listMultipartObjectParams struct {
 
 // Filesystem - local variables
 type Filesystem struct {
-	path                        string
+	diskPath                    string
 	minFreeDisk                 int64
 	rwLock                      *sync.RWMutex
 	listObjectMap               map[listObjectParams][]*treeWalker
@@ -51,20 +54,21 @@ type Filesystem struct {
 }
 
 // newFS instantiate a new filesystem.
-func newFS(rootPath string) (ObjectAPI, *probe.Error) {
+func newFS(diskPath string) (ObjectAPI, *probe.Error) {
 	fs := &Filesystem{
 		rwLock: &sync.RWMutex{},
 	}
-	fs.path = rootPath
+	fs.diskPath = diskPath
 
 	/// Defaults
-
 	// Minium free disk required for i/o operations to succeed.
 	fs.minFreeDisk = 5
 
+	// Initialize list object map.
 	fs.listObjectMap = make(map[listObjectParams][]*treeWalker)
 	fs.listObjectMapMutex = &sync.Mutex{}
 
+	// Initialize list multipart map.
 	fs.listMultipartObjectMap = make(map[listMultipartObjectParams][]multipartObjectInfoChannel)
 	fs.listMultipartObjectMapMutex = &sync.Mutex{}
 
@@ -72,7 +76,37 @@ func newFS(rootPath string) (ObjectAPI, *probe.Error) {
 	return fs, nil
 }
 
+func (fs Filesystem) checkBucketArg(bucket string) (string, error) {
+	if !IsValidBucketName(bucket) {
+		return "", BucketNameInvalid{Bucket: bucket}
+	}
+	bucket = getActualBucketname(fs.diskPath, bucket)
+	if status, e := isDirExist(filepath.Join(fs.diskPath, bucket)); !status {
+		if e == nil {
+			return "", BucketNotFound{Bucket: bucket}
+		} else if os.IsNotExist(e) {
+			return "", BucketNotFound{Bucket: bucket}
+		} else {
+			return "", e
+		}
+	}
+	return bucket, nil
+}
+
+func checkDiskFree(diskPath string, minFreeDisk int64) error {
+	di, e := disk.GetInfo(diskPath)
+	if e != nil {
+		return e
+	}
+	// Remove 5% from total space for cumulative disk space used for journalling, inodes etc.
+	availableDiskSpace := (float64(di.Free) / (float64(di.Total) - (0.05 * float64(di.Total)))) * 100
+	if int64(availableDiskSpace) <= minFreeDisk {
+		return RootPathFull{Path: diskPath}
+	}
+	return nil
+}
+
 // GetRootPath - get root path.
 func (fs Filesystem) GetRootPath() string {
-	return fs.path
+	return fs.diskPath
 }