gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #470 from stepanbujnak/master

Browse Source 
Added locking on the filer move operation
This commit is contained in:
Chris Lu
2017-03-11 20:20:43 -08:00
committed by GitHub
parent b20cdff82d a72c92e55f
commit 427c7fbf93
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
weed/filer/embedded_filer/filer_embedded.go
View File

@@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"strings" "strings"
"sync"
"github.com/chrislusf/seaweedfs/weed/filer" "github.com/chrislusf/seaweedfs/weed/filer"
"github.com/chrislusf/seaweedfs/weed/operation" "github.com/chrislusf/seaweedfs/weed/operation"
@@ -14,6 +15,7 @@ type FilerEmbedded struct {
master string master string
directories *DirectoryManagerInMap directories *DirectoryManagerInMap
files *FileListInLevelDb files *FileListInLevelDb
mvMutex sync.Mutex
} }
func NewFilerEmbedded(master string, dir string) (filer *FilerEmbedded, err error) { func NewFilerEmbedded(master string, dir string) (filer *FilerEmbedded, err error) {
@@ -121,6 +123,9 @@ mv fromFile toDir
mv fromFile toFile mv fromFile toFile
*/ */
func (filer *FilerEmbedded) Move(fromPath string, toPath string) error { func (filer *FilerEmbedded) Move(fromPath string, toPath string) error {
filer.mvMutex.Lock()
defer filer.mvMutex.Unlock()
if _, dir_err := filer.FindDirectory(fromPath); dir_err == nil { if _, dir_err := filer.FindDirectory(fromPath); dir_err == nil {
if _, err := filer.FindDirectory(toPath); err == nil { if _, err := filer.FindDirectory(toPath); err == nil {
// move folder under an existing folder // move folder under an existing folder