diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-06-01 00:39:39 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-06-01 00:39:39 -0700 |
| commit | 43e3f5724ca31918cd5a3d282639bd4f34e6bc58 (patch) | |
| tree | 8aa653c78756a9adc2f98e7e281e0892bad95735 /weed/server/filer_grpc_server.go | |
| parent | a6f7f9b0b8baedad7b1555c7e01a4ab3cec3784c (diff) | |
| download | seaweedfs-43e3f5724ca31918cd5a3d282639bd4f34e6bc58.tar.xz seaweedfs-43e3f5724ca31918cd5a3d282639bd4f34e6bc58.zip | |
use fixed list of masters in both filer and volume servers
Diffstat (limited to 'weed/server/filer_grpc_server.go')
| -rw-r--r-- | weed/server/filer_grpc_server.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/weed/server/filer_grpc_server.go b/weed/server/filer_grpc_server.go index da0014af3..8a80cded5 100644 --- a/weed/server/filer_grpc_server.go +++ b/weed/server/filer_grpc_server.go @@ -88,7 +88,7 @@ func (fs *FilerServer) GetEntryAttributes(ctx context.Context, req *filer_pb.Get func (fs *FilerServer) LookupVolume(ctx context.Context, req *filer_pb.LookupVolumeRequest) (*filer_pb.LookupVolumeResponse, error) { - lookupResult, err := operation.LookupVolumeIds(fs.getMasterNode(), req.VolumeIds) + lookupResult, err := operation.LookupVolumeIds(fs.filer.GetMaster(), req.VolumeIds) if err != nil { return nil, err } @@ -172,11 +172,11 @@ func (fs *FilerServer) UpdateEntry(ctx context.Context, req *filer_pb.UpdateEntr if err = fs.filer.UpdateEntry(newEntry); err == nil { for _, garbage := range unusedChunks { glog.V(0).Infof("deleting %s old chunk: %v, [%d, %d)", fullpath, garbage.FileId, garbage.Offset, garbage.Offset+int64(garbage.Size)) - operation.DeleteFile(fs.master, garbage.FileId, fs.jwt(garbage.FileId)) + operation.DeleteFile(fs.filer.GetMaster(), garbage.FileId, fs.jwt(garbage.FileId)) } for _, garbage := range garbages { glog.V(0).Infof("deleting %s garbage chunk: %v, [%d, %d)", fullpath, garbage.FileId, garbage.Offset, garbage.Offset+int64(garbage.Size)) - operation.DeleteFile(fs.master, garbage.FileId, fs.jwt(garbage.FileId)) + operation.DeleteFile(fs.filer.GetMaster(), garbage.FileId, fs.jwt(garbage.FileId)) } } @@ -190,7 +190,7 @@ func (fs *FilerServer) DeleteEntry(ctx context.Context, req *filer_pb.DeleteEntr func (fs *FilerServer) AssignVolume(ctx context.Context, req *filer_pb.AssignVolumeRequest) (resp *filer_pb.AssignVolumeResponse, err error) { - assignResult, err := operation.Assign(fs.master, &operation.VolumeAssignRequest{ + assignResult, err := operation.Assign(fs.filer.GetMaster(), &operation.VolumeAssignRequest{ Count: uint64(req.Count), Replication: req.Replication, Collection: req.Collection, |