From d2c9da863efcd02382d48893d0847e5305e811e0 Mon Sep 17 00:00:00 2001
From: Jonathan Pastor <jonathancmoa@gmail.com>
Date: Mon, 2 Dec 2019 12:53:59 +0100
Subject: [PATCH] pre-sort resources by cpu/core to handle old clusters
---
lib/refrepo/gen/oar-properties.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb
index ac106f0baf..0fee151e1d 100644
--- a/lib/refrepo/gen/oar-properties.rb
+++ b/lib/refrepo/gen/oar-properties.rb
@@ -1135,6 +1135,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
cluster_resources = site_resources
.select{|r| r["cluster"] == cluster_name}
.select{|r| cluster_nodes.include?(r["host"].split(".")[0])}
+ .sort_by{|r| [r["cpu"], r["core"]]}
sanity_check_result = sanity_check(cluster_resources, site_resources)
unless sanity_check_result
--
GitLab