MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-03-28 08:20:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #653 from harshavardhana/pr_out_hold_lock_on_getglobalstatekey_fixes_652

Browse Source 
Hold lock on GetGlobalStateKey() - fixes #652
This commit is contained in:
Harshavardhana 2015-06-17 20:44:03 -07:00
commit 3842a57f52
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/iodine/iodine.go
View File

@ -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 ""
}

2
pkg/storage/drivers/fs/fs_bucket.go
View File

@ -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)
}

2
pkg/storage/drivers/fs/fs_filter.go
View File

@ -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