gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Filtering by volume id is prioritized.

Browse source
This commit is contained in:
user 2021-11-11 18:18:56 +09:00
parent 563a74a9eb
commit 9668b15f38
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
weed/shell/command_volume_configure_replication.go
View file

@ -111,16 +111,16 @@ func (c *commandVolumeConfigureReplication) Do(args []string, commandEnv *Comman
func getVolumeFilter(replicaPlacement *super_block.ReplicaPlacement, volumeId uint32, collectionPattern string) func(message *master_pb.VolumeInformationMessage) bool { func getVolumeFilter(replicaPlacement *super_block.ReplicaPlacement, volumeId uint32, collectionPattern string) func(message *master_pb.VolumeInformationMessage) bool {
replicaPlacementInt32 := uint32(replicaPlacement.Byte()) replicaPlacementInt32 := uint32(replicaPlacement.Byte())
if collectionPattern != "" { if volumeId > 0 {
return func(v *master_pb.VolumeInformationMessage) bool { return func(v *master_pb.VolumeInformationMessage) bool {
matched, err := filepath.Match(collectionPattern, v.Collection) return v.Id == volumeId && v.ReplicaPlacement != replicaPlacementInt32
if err != nil {
return false
}
return matched
} }
} }
return func(v *master_pb.VolumeInformationMessage) bool { return func(v *master_pb.VolumeInformationMessage) bool {
return v.Id == volumeId && v.ReplicaPlacement != replicaPlacementInt32 matched, err := filepath.Match(collectionPattern, v.Collection)
if err != nil {
return false
}
return matched
} }
} }