[ARVADOS] updated: 2.1.0-1303-g47e606711

[Git user]

Summary of changes:
 services/keepstore/volume.go | 3 +++
 1 file changed, 3 insertions(+)

       via  47e60671196e91dea0b99a2c4496ce0fdc683852 (commit)
       via  7e07df0d9a176e67fe0988a4194f11c2b4aeb851 (commit)
      from  3a1fa40344388f851e28e2822780ae1a81a4ae44 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 47e60671196e91dea0b99a2c4496ce0fdc683852
Merge: 3a1fa4034 7e07df0d9
Author: Tom Clegg <tom at curii.com>
Date:   Tue Sep 7 13:48:28 2021 -0400

    Merge branch '18021-sort-mounts'
    
    fixes #18021
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>


commit 7e07df0d9a176e67fe0988a4194f11c2b4aeb851
Author: Tom Clegg <tom at curii.com>
Date:   Tue Sep 7 10:56:04 2021 -0400

    18021: Sort mounts to fix flaky test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/keepstore/volume.go b/services/keepstore/volume.go
index 3f7c9cb79..cf0b7a390 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
 }
 

-----------------------------------------------------------------------


hooks/post-receive
--