From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 028A6D2D7 for ; Wed, 30 Nov 2022 14:21:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CFDE41DFD2 for ; Wed, 30 Nov 2022 14:21:07 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 30 Nov 2022 14:21:07 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 10DC143690 for ; Wed, 30 Nov 2022 14:21:07 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 30 Nov 2022 14:20:54 +0100 Message-Id: <20221130132054.66009-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.163 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 Subject: [pmg-devel] [PATCH pmg-api] rulecache: sort rules additionally by id X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2022 13:21:38 -0000 When more rules have the same priority currently their order is not stable - postgres returns them in a stable way, based on their last changetime - e.g. disabling and reenabling a rule puts it in the front of evaluation. Sortin by id (the primary key) in addition should make rule evaluation robust to such updates While there is no guarantee of ordering (within the same priority) unexpected changes in which rule fires can cause confusion (at least it confused me quite a bit). Reported-by: Mira Limbeck Signed-off-by: Stoiko Ivanov --- With this applied I got stable ruleaction executions across rule-changes and pmg-smtp-filter restarts, but would appreciate some additional test src/PMG/RuleCache.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PMG/RuleCache.pm b/src/PMG/RuleCache.pm index d35e9c1..ebce98e 100644 --- a/src/PMG/RuleCache.pm +++ b/src/PMG/RuleCache.pm @@ -37,7 +37,7 @@ sub new { my $sth = $dbh->prepare( "SELECT ID, Name, Priority, Active, Direction FROM Rule " . "where Active > 0 " . - "ORDER BY Priority DESC"); + "ORDER BY Priority, ID DESC"); $sth->execute(); -- 2.30.2