diff options
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/filer/filer_conf.go | 3 | ||||
| -rw-r--r-- | weed/server/master_grpc_server_volume.go | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/weed/filer/filer_conf.go b/weed/filer/filer_conf.go index b12d54fc8..f3a25242d 100644 --- a/weed/filer/filer_conf.go +++ b/weed/filer/filer_conf.go @@ -125,7 +125,8 @@ func (fc *FilerConf) DeleteLocationConf(locationPrefix string) { if string(key) == locationPrefix { return true } - rules.Put(key, value) + key = bytes.Clone(key) + _ = rules.Put(key, value) return true }) fc.rules = rules diff --git a/weed/server/master_grpc_server_volume.go b/weed/server/master_grpc_server_volume.go index 06dbb4bb5..a2676accf 100644 --- a/weed/server/master_grpc_server_volume.go +++ b/weed/server/master_grpc_server_volume.go @@ -309,13 +309,7 @@ func (ms *MasterServer) VolumeMarkReadonly(ctx context.Context, req *master_pb.V replicaPlacement, _ := super_block.NewReplicaPlacementFromByte(byte(req.ReplicaPlacement)) vl := ms.Topo.GetVolumeLayout(req.Collection, replicaPlacement, needle.LoadTTLFromUint32(req.Ttl), types.ToDiskType(req.DiskType)) dataNodes := ms.Topo.Lookup(req.Collection, needle.VolumeId(req.VolumeId)) - if req.IsReadonly { - for _, dn := range dataNodes { - if dn.Ip == req.Ip && dn.Port == int(req.Port) { - } - } - } for _, dn := range dataNodes { if dn.Ip == req.Ip && dn.Port == int(req.Port) { if req.IsReadonly { |