diff options
| -rw-r--r-- | weed/topology/data_node.go | 10 | ||||
| -rw-r--r-- | weed/topology/disk.go | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/weed/topology/data_node.go b/weed/topology/data_node.go index 0ce6fdbee..ee0d37956 100644 --- a/weed/topology/data_node.go +++ b/weed/topology/data_node.go @@ -54,14 +54,14 @@ func (dn *DataNode) getOrCreateDisk(diskType string) *Disk { return disk } -func (dn *DataNode) doAddOrUpdateVolume(v storage.VolumeInfo) (isNew, isChangedRO bool) { +func (dn *DataNode) doAddOrUpdateVolume(v storage.VolumeInfo) (isNew, isChanged bool) { disk := dn.getOrCreateDisk(v.DiskType) return disk.AddOrUpdateVolume(v) } // UpdateVolumes detects new/deleted/changed volumes on a volume server // used in master to notify master clients of these changes. -func (dn *DataNode) UpdateVolumes(actualVolumes []storage.VolumeInfo) (newVolumes, deletedVolumes, changeRO []storage.VolumeInfo) { +func (dn *DataNode) UpdateVolumes(actualVolumes []storage.VolumeInfo) (newVolumes, deletedVolumes, changedVolumes []storage.VolumeInfo) { actualVolumeMap := make(map[needle.VolumeId]storage.VolumeInfo) for _, v := range actualVolumes { @@ -94,12 +94,12 @@ func (dn *DataNode) UpdateVolumes(actualVolumes []storage.VolumeInfo) (newVolume } } for _, v := range actualVolumes { - isNew, isChangedRO := dn.doAddOrUpdateVolume(v) + isNew, isChanged := dn.doAddOrUpdateVolume(v) if isNew { newVolumes = append(newVolumes, v) } - if isChangedRO { - changeRO = append(changeRO, v) + if isChanged { + changedVolumes = append(changedVolumes, v) } } return diff --git a/weed/topology/disk.go b/weed/topology/disk.go index 1917d7126..f4adc0e72 100644 --- a/weed/topology/disk.go +++ b/weed/topology/disk.go @@ -144,13 +144,13 @@ func (d *Disk) String() string { return fmt.Sprintf("Disk:%s, volumes:%v, ecShards:%v", d.NodeImpl.String(), d.volumes, d.ecShards) } -func (d *Disk) AddOrUpdateVolume(v storage.VolumeInfo) (isNew, isChangedRO bool) { +func (d *Disk) AddOrUpdateVolume(v storage.VolumeInfo) (isNew, isChanged bool) { d.Lock() defer d.Unlock() return d.doAddOrUpdateVolume(v) } -func (d *Disk) doAddOrUpdateVolume(v storage.VolumeInfo) (isNew, isChangedRO bool) { +func (d *Disk) doAddOrUpdateVolume(v storage.VolumeInfo) (isNew, isChanged bool) { deltaDiskUsages := newDiskUsages() deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.ToDiskType(v.DiskType)) if oldV, ok := d.volumes[v.Id]; !ok { @@ -175,7 +175,7 @@ func (d *Disk) doAddOrUpdateVolume(v storage.VolumeInfo) (isNew, isChangedRO boo } d.UpAdjustDiskUsageDelta(deltaDiskUsages) } - isChangedRO = d.volumes[v.Id].ReadOnly != v.ReadOnly + isChanged = d.volumes[v.Id].ReadOnly != v.ReadOnly d.volumes[v.Id] = v } return |