From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 06CDA1FF15E for ; Tue, 28 Jan 2025 13:26:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0C5CFCDC7; Tue, 28 Jan 2025 13:26:24 +0100 (CET) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Date: Tue, 28 Jan 2025 13:25:14 +0100 Message-Id: <20250128122520.167796-10-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250128122520.167796-1-l.wagner@proxmox.com> References: <20250128122520.167796-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pdm-devel] [PATCH proxmox-datacenter-manager 09/15] remote tasks: return tasks in stable order X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" Since the tasks are retrieved from the cache by key and this key comes from iterating a hashmap, the order of the tasks with the same start time was unstable. Since we have to sort anyway, we can fix this by simply using a tasks UPID as a secondary sorting criterium. The UPID starts with the remote's name, so this boils down to using the remote name as a secondary criterium. Signed-off-by: Lukas Wagner --- server/src/remote_tasks/mod.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/server/src/remote_tasks/mod.rs b/server/src/remote_tasks/mod.rs index 16c46a5..3da6f25 100644 --- a/server/src/remote_tasks/mod.rs +++ b/server/src/remote_tasks/mod.rs @@ -1,4 +1,5 @@ use std::{ + cmp::Ordering, collections::HashSet, path::Path, sync::{LazyLock, RwLock}, @@ -73,7 +74,15 @@ pub async fn get_tasks(filters: TaskFilters) -> Result, Error> } let mut returned_tasks = add_running_tasks(all_tasks)?; - returned_tasks.sort_by(|a, b| b.starttime.cmp(&a.starttime)); + + // Sort merged tasks by starttime, falling back to UPID if the starttime is equal. + // This UPID starts with the remote name, so this equates to using the remote name + // as a secondary sorting criterium. + returned_tasks.sort_by(|a, b| match b.starttime.cmp(&a.starttime) { + Ordering::Equal => a.upid.cmp(&b.upid), + ord => ord, + }); + let returned_tasks = returned_tasks .into_iter() .filter(|item| { -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel