From: Tom Clegg <tom@curii.com>
Date: Tue, 7 Sep 2021 14:56:04 +0000 (-0400)
Subject: 18021: Sort mounts to fix flaky test.
X-Git-Tag: 2.3.0~83^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7e07df0d9a176e67fe0988a4194f11c2b4aeb851

18021: Sort mounts to fix flaky test.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/services/keepstore/volume.go b/services/keepstore/volume.go
index 3f7c9cb79b..cf0b7a3902 100644
--- a/services/keepstore/volume.go
+++ b/services/keepstore/volume.go
@@ -371,6 +371,9 @@ func makeRRVolumeManager(logger logrus.FieldLogger, cluster *arvados.Cluster, my
 	sort.Slice(vm.writables, func(i, j int) bool {
 		return less(vm.writables[i], vm.writables[j])
 	})
+	sort.Slice(vm.mounts, func(i, j int) bool {
+		return less(vm.mounts[i], vm.mounts[j])
+	})
 	return vm, nil
 }