MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-03-13 05:00:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix config.json parsing to fetch correct storage class (#5327)

Browse Source
This commit is contained in:
Nitish Tiwari 2017-12-28 14:19:45 +05:30 committed by GitHub
parent 751632d79e
commit e3d841ffd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/config-current.go
View File

@ -113,13 +113,13 @@ func (s *serverConfig) SetStorageClass(standardClass, rrsClass storageClass) {
s.StorageClass.RRS = rrsClass.Scheme + strconv.Itoa(rrsClass.Parity) s.StorageClass.RRS = rrsClass.Scheme + strconv.Itoa(rrsClass.Parity)
} }
func (s *serverConfig) GetStorageClass() (standardStorageClass, rrsStorageClass storageClass) { // GetStorageClass reads storage class fields from current config, parses and validates it.
// It returns the standard and reduced redundancy storage class struct
func (s *serverConfig) GetStorageClass() (ssc, rrsc storageClass) {
s.RLock() s.RLock()
defer s.RUnlock() defer s.RUnlock()
var err error var err error
var ssc storageClass
var rrsc storageClass
if s.StorageClass.Standard != "" { if s.StorageClass.Standard != "" {
// Parse the values read from config file into storageClass struct // Parse the values read from config file into storageClass struct
@ -136,13 +136,13 @@ func (s *serverConfig) GetStorageClass() (standardStorageClass, rrsStorageClass
// Validation is done after parsing both the storage classes. This is needed because we need one // Validation is done after parsing both the storage classes. This is needed because we need one
// storage class value to deduce the correct value of the other storage class. // storage class value to deduce the correct value of the other storage class.
if rrsc.Scheme != "" { if rrsc.Scheme != "" {
err := validateRRSParity(rrsc.Parity, ssc.Parity) err = validateRRSParity(rrsc.Parity, ssc.Parity)
fatalIf(err, "Invalid value %s set in config.json", s.StorageClass.RRS) fatalIf(err, "Invalid value %s set in config.json", s.StorageClass.RRS)
globalIsStorageClass = true globalIsStorageClass = true
} }
if ssc.Scheme != "" { if ssc.Scheme != "" {
err := validateSSParity(ssc.Parity, rrsc.Parity) err = validateSSParity(ssc.Parity, rrsc.Parity)
fatalIf(err, "Invalid value %s set in config.json", s.StorageClass.Standard) fatalIf(err, "Invalid value %s set in config.json", s.StorageClass.Standard)
globalIsStorageClass = true globalIsStorageClass = true
} }