mirror of
https://github.com/minio/minio.git
synced 2025-03-27 07:50:58 -04:00
Merge pull request #653 from harshavardhana/pr_out_hold_lock_on_getglobalstatekey_fixes_652
Hold lock on GetGlobalStateKey() - fixes #652
This commit is contained in:
commit
3842a57f52
@ -87,7 +87,9 @@ func GetGlobalState() map[string]string {
|
||||
|
||||
// GetGlobalStateKey - get value for key from globalState struct
|
||||
func GetGlobalStateKey(k string) string {
|
||||
globalState.RLock()
|
||||
result, ok := globalState.m[k]
|
||||
globalState.RUnlock()
|
||||
if !ok {
|
||||
return ""
|
||||
}
|
||||
|
@ -192,7 +192,7 @@ func (fs *fsDriver) ListObjects(bucket string, resources drivers.BucketResources
|
||||
break
|
||||
}
|
||||
if name > resources.Marker {
|
||||
metadata, resources, err = fs.filter(bucket, name, p.files[name], resources)
|
||||
metadata, resources, err = fs.filterObjects(bucket, name, p.files[name], resources)
|
||||
if err != nil {
|
||||
return []drivers.ObjectMetadata{}, resources, iodine.New(err, nil)
|
||||
}
|
||||
|
@ -24,7 +24,7 @@ import (
|
||||
"github.com/minio/minio/pkg/storage/drivers"
|
||||
)
|
||||
|
||||
func (fs *fsDriver) filter(bucket, name string, file os.FileInfo, resources drivers.BucketResourcesMetadata) (drivers.ObjectMetadata, drivers.BucketResourcesMetadata, error) {
|
||||
func (fs *fsDriver) filterObjects(bucket, name string, file os.FileInfo, resources drivers.BucketResourcesMetadata) (drivers.ObjectMetadata, drivers.BucketResourcesMetadata, error) {
|
||||
var err error
|
||||
var metadata drivers.ObjectMetadata
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user