multipart: Code cleanup

- More locking cleanup. Fix naming convention.
- Simplify concatenation and blocking calls.

pkg/fs/config.go

@@ -17,77 +17,42 @@
 package fs
 
 import (
-	"path/filepath"
-
 	"github.com/minio/minio-xl/pkg/probe"
 	"github.com/minio/minio-xl/pkg/quick"
-	"github.com/minio/minio/pkg/user"
 )
 
-func getFSBucketsConfigPath() (string, *probe.Error) {
-	if customBucketsConfigPath != "" {
-		return customBucketsConfigPath, nil
-	}
-	homeDir, e := user.HomeDir()
-	if e != nil {
-		return "", probe.NewError(e)
-	}
-	fsBucketsConfigPath := filepath.Join(homeDir, ".minio", "$buckets.json")
-	return fsBucketsConfigPath, nil
+var multipartsMetadataPath, bucketsMetadataPath string
+
+// setFSBucketsMetadataPath - set fs buckets metadata path.
+func setFSBucketsMetadataPath(metadataPath string) {
+	bucketsMetadataPath = metadataPath
 }
 
-func getFSMultipartsSessionConfigPath() (string, *probe.Error) {
-	if customMultipartsConfigPath != "" {
-		return customMultipartsConfigPath, nil
-	}
-	homeDir, e := user.HomeDir()
-	if e != nil {
-		return "", probe.NewError(e)
-	}
-	fsMultipartsConfigPath := filepath.Join(homeDir, ".minio", "$multiparts-session.json")
-	return fsMultipartsConfigPath, nil
-}
-
-// internal variable only accessed via get/set methods
-var customMultipartsConfigPath, customBucketsConfigPath string
-
-// setFSBucketsConfigPath - set custom fs buckets config path
-func setFSBucketsConfigPath(configPath string) {
-	customBucketsConfigPath = configPath
-}
-
-// SetFSMultipartsConfigPath - set custom multiparts session config path
-func setFSMultipartsConfigPath(configPath string) {
-	customMultipartsConfigPath = configPath
+// SetFSMultipartsMetadataPath - set custom multiparts session
+// metadata path.
+func setFSMultipartsMetadataPath(metadataPath string) {
+	multipartsMetadataPath = metadataPath
 }
 
 // saveMultipartsSession - save multiparts
-func saveMultipartsSession(multiparts *Multiparts) *probe.Error {
-	fsMultipartsConfigPath, err := getFSMultipartsSessionConfigPath()
-	if err != nil {
-		return err.Trace()
-	}
+func saveMultipartsSession(multiparts Multiparts) *probe.Error {
 	qc, err := quick.New(multiparts)
 	if err != nil {
 		return err.Trace()
 	}
-	if err := qc.Save(fsMultipartsConfigPath); err != nil {
+	if err := qc.Save(multipartsMetadataPath); err != nil {
 		return err.Trace()
 	}
 	return nil
 }
 
 // saveBucketsMetadata - save metadata of all buckets
-func saveBucketsMetadata(buckets *Buckets) *probe.Error {
-	fsBucketsConfigPath, err := getFSBucketsConfigPath()
-	if err != nil {
-		return err.Trace()
-	}
+func saveBucketsMetadata(buckets Buckets) *probe.Error {
 	qc, err := quick.New(buckets)
 	if err != nil {
 		return err.Trace()
 	}
-	if err := qc.Save(fsBucketsConfigPath); err != nil {
+	if err := qc.Save(bucketsMetadataPath); err != nil {
 		return err.Trace()
 	}
 	return nil
@@ -95,10 +60,6 @@ func saveBucketsMetadata(buckets *Buckets) *probe.Error {
 
 // loadMultipartsSession load multipart session file
 func loadMultipartsSession() (*Multiparts, *probe.Error) {
-	fsMultipartsConfigPath, err := getFSMultipartsSessionConfigPath()
-	if err != nil {
-		return nil, err.Trace()
-	}
 	multiparts := &Multiparts{}
 	multiparts.Version = "1"
 	multiparts.ActiveSession = make(map[string]*MultipartSession)
@@ -106,7 +67,7 @@ func loadMultipartsSession() (*Multiparts, *probe.Error) {
 	if err != nil {
 		return nil, err.Trace()
 	}
-	if err := qc.Load(fsMultipartsConfigPath); err != nil {
+	if err := qc.Load(multipartsMetadataPath); err != nil {
 		return nil, err.Trace()
 	}
 	return qc.Data().(*Multiparts), nil
@@ -114,10 +75,6 @@ func loadMultipartsSession() (*Multiparts, *probe.Error) {
 
 // loadBucketsMetadata load buckets metadata file
 func loadBucketsMetadata() (*Buckets, *probe.Error) {
-	fsBucketsConfigPath, err := getFSBucketsConfigPath()
-	if err != nil {
-		return nil, err.Trace()
-	}
 	buckets := &Buckets{}
 	buckets.Version = "1"
 	buckets.Metadata = make(map[string]*BucketMetadata)
@@ -125,7 +82,7 @@ func loadBucketsMetadata() (*Buckets, *probe.Error) {
 	if err != nil {
 		return nil, err.Trace()
 	}
-	if err := qc.Load(fsBucketsConfigPath); err != nil {
+	if err := qc.Load(bucketsMetadataPath); err != nil {
 		return nil, err.Trace()
 	}
 	return qc.Data().(*Buckets), nil