lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-19 14:39:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid race conditions with current filer address (#3474)

Browse Source 
When multiple filer requests are in-flight and the current filer
disappears and a new one is selected by the first goroutine, then
there can be a lot of race conditions while retrieving the current
filer.
Therefore, load/save the current filer index atomically.
This commit is contained in:
Patrick Schmidt
2022-08-21 21:18:13 +02:00
committed by GitHub
parent f49a9297c2
commit 2ef6ab998c
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
weed/mount/weedfs.go
View File

@@ -2,7 +2,16 @@ package mount
import ( import (
"context" "context"
"math/rand"
"os"
"path"
"path/filepath"
"sync/atomic"
"time"
"github.com/hanwen/go-fuse/v2/fuse" "github.com/hanwen/go-fuse/v2/fuse"
"google.golang.org/grpc"
"github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/filer"
"github.com/seaweedfs/seaweedfs/weed/mount/meta_cache" "github.com/seaweedfs/seaweedfs/weed/mount/meta_cache"
"github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb"
@@ -13,12 +22,6 @@ import (
"github.com/seaweedfs/seaweedfs/weed/util/chunk_cache" "github.com/seaweedfs/seaweedfs/weed/util/chunk_cache"
"github.com/seaweedfs/seaweedfs/weed/util/grace" "github.com/seaweedfs/seaweedfs/weed/util/grace"
"github.com/seaweedfs/seaweedfs/weed/wdclient" "github.com/seaweedfs/seaweedfs/weed/wdclient"
"google.golang.org/grpc"
"math/rand"
"os"
"path"
"path/filepath"
"time"
"github.com/hanwen/go-fuse/v2/fs" "github.com/hanwen/go-fuse/v2/fs"
) )
@@ -26,7 +29,7 @@ import (
type Option struct { type Option struct {
MountDirectory string MountDirectory string
FilerAddresses []pb.ServerAddress FilerAddresses []pb.ServerAddress
filerIndex int filerIndex int32
GrpcDialOption grpc.DialOption GrpcDialOption grpc.DialOption
FilerMountRootPath string FilerMountRootPath string
Collection string Collection string
@@ -86,7 +89,7 @@ func NewSeaweedFileSystem(option *Option) *WFS {
dhmap: NewDirectoryHandleToInode(), dhmap: NewDirectoryHandleToInode(),
} }
wfs.option.filerIndex = rand.Intn(len(option.FilerAddresses)) wfs.option.filerIndex = int32(rand.Intn(len(option.FilerAddresses)))
wfs.option.setupUniqueCacheDirectory() wfs.option.setupUniqueCacheDirectory()
if option.CacheSizeMB > 0 { if option.CacheSizeMB > 0 {
wfs.chunkCache = chunk_cache.NewTieredChunkCache(256, option.getUniqueCacheDir(), option.CacheSizeMB, 1024*1024) wfs.chunkCache = chunk_cache.NewTieredChunkCache(256, option.getUniqueCacheDir(), option.CacheSizeMB, 1024*1024)
@@ -181,7 +184,8 @@ func (wfs *WFS) LookupFn() wdclient.LookupFileIdFunctionType {
} }
func (wfs *WFS) getCurrentFiler() pb.ServerAddress { func (wfs *WFS) getCurrentFiler() pb.ServerAddress {
return wfs.option.FilerAddresses[wfs.option.filerIndex] i := atomic.LoadInt32(&wfs.option.filerIndex)
return wfs.option.FilerAddresses[i]
} }
func (option *Option) setupUniqueCacheDirectory() { func (option *Option) setupUniqueCacheDirectory() {

12
weed/mount/wfs_filer_client.go
View File

@@ -1,12 +1,14 @@
package mount package mount
import ( import (
"github.com/seaweedfs/seaweedfs/weed/glog" "sync/atomic"
"github.com/seaweedfs/seaweedfs/weed/util"
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb"
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
"github.com/seaweedfs/seaweedfs/weed/util"
) )
var _ = filer_pb.FilerClient(&WFS{}) var _ = filer_pb.FilerClient(&WFS{})
@@ -15,7 +17,7 @@ func (wfs *WFS) WithFilerClient(streamingMode bool, fn func(filer_pb.SeaweedFile
return util.Retry("filer grpc", func() error { return util.Retry("filer grpc", func() error {
i := wfs.option.filerIndex i := atomic.LoadInt32(&wfs.option.filerIndex)
n := len(wfs.option.FilerAddresses) n := len(wfs.option.FilerAddresses)
for x := 0; x < n; x++ { for x := 0; x < n; x++ {
@@ -28,12 +30,12 @@ func (wfs *WFS) WithFilerClient(streamingMode bool, fn func(filer_pb.SeaweedFile
if err != nil { if err != nil {
glog.V(0).Infof("WithFilerClient %d %v: %v", x, filerGrpcAddress, err) glog.V(0).Infof("WithFilerClient %d %v: %v", x, filerGrpcAddress, err)
} else { } else {
wfs.option.filerIndex = i atomic.StoreInt32(&wfs.option.filerIndex, i)
return nil return nil
} }
i++ i++
if i >= n { if i >= int32(n) {
i = 0 i = 0
} }