From ef2403f80e027b59b5d4b9cd2dd84020384c1919 Mon Sep 17 00:00:00 2001 From: Di Xu Date: Sun, 30 Jul 2017 21:57:18 +0800 Subject: [PATCH] send volumesInUse sorted in node status updates --- pkg/kubelet/volumemanager/volume_manager.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkg/kubelet/volumemanager/volume_manager.go b/pkg/kubelet/volumemanager/volume_manager.go index a71c05412f5..d48266f52a3 100644 --- a/pkg/kubelet/volumemanager/volume_manager.go +++ b/pkg/kubelet/volumemanager/volume_manager.go @@ -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 }