send volumesInUse sorted in node status updates

pull/6/head
Di Xu 2017-07-30 21:57:18 +08:00
parent 3d3d3922c2
commit ef2403f80e
1 changed files with 6 additions and 9 deletions

View File

@ -18,6 +18,7 @@ package volumemanager
import (
"fmt"
"sort"
"strconv"
"time"
@ -286,15 +287,8 @@ func (vm *volumeManager) GetVolumesInUse() []v1.UniqueVolumeName {
// volume *should* be attached to this node until it is safely unmounted.
desiredVolumes := vm.desiredStateOfWorld.GetVolumesToMount()
mountedVolumes := vm.actualStateOfWorld.GetGloballyMountedVolumes()
volumesToReportInUse :=
make(
[]v1.UniqueVolumeName,
0, /* len */
len(desiredVolumes)+len(mountedVolumes) /* cap */)
desiredVolumesMap :=
make(
map[v1.UniqueVolumeName]bool,
len(desiredVolumes)+len(mountedVolumes) /* cap */)
volumesToReportInUse := make([]v1.UniqueVolumeName, 0, len(desiredVolumes)+len(mountedVolumes))
desiredVolumesMap := make(map[v1.UniqueVolumeName]bool, len(desiredVolumes)+len(mountedVolumes))
for _, volume := range desiredVolumes {
if volume.PluginIsAttachable {
@ -313,6 +307,9 @@ func (vm *volumeManager) GetVolumesInUse() []v1.UniqueVolumeName {
}
}
sort.Slice(volumesToReportInUse, func(i, j int) bool {
return string(volumesToReportInUse[i]) < string(volumesToReportInUse[j])
})
return volumesToReportInUse
}