aboutsummaryrefslogtreecommitdiff
path: root/weed/server
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2019-04-14 23:00:37 -0700
committerChris Lu <chris.lu@gmail.com>2019-04-14 23:00:37 -0700
commit3e8a3a8fec6df5b39b6b2b4603df8bc183d90aa8 (patch)
tree8ce00d95e2f923b6b7d82fe15ba9793502815e8d /weed/server
parent26aaccca088e099ea87d2ba60cfbdbc2e7f3d77f (diff)
downloadseaweedfs-3e8a3a8fec6df5b39b6b2b4603df8bc183d90aa8.tar.xz
seaweedfs-3e8a3a8fec6df5b39b6b2b4603df8bc183d90aa8.zip
fix race detector found problems
Diffstat (limited to 'weed/server')
-rw-r--r--weed/server/volume_grpc_client_to_master.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go
index 94e99c8f6..cf01b5bd8 100644
--- a/weed/server/volume_grpc_client_to_master.go
+++ b/weed/server/volume_grpc_client_to_master.go
@@ -2,10 +2,11 @@ package weed_server
import (
"fmt"
+ "time"
+
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/spf13/viper"
"google.golang.org/grpc"
- "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
@@ -75,7 +76,7 @@ func (vs *VolumeServer) doHeartbeat(ctx context.Context, masterNode, masterGrpcA
return
}
if in.GetVolumeSizeLimit() != 0 {
- vs.store.VolumeSizeLimit = in.GetVolumeSizeLimit()
+ vs.store.SetVolumeSizeLimit(in.GetVolumeSizeLimit())
}
if in.GetLeader() != "" && masterNode != in.GetLeader() {
glog.V(0).Infof("Volume Server found a new master newLeader: %v instead of %v", in.GetLeader(), masterNode)