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 EDF817D50A for ; Tue, 9 Nov 2021 07:53:09 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 72E6C2E156 for ; Tue, 9 Nov 2021 07:53:08 +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 id C50852DF8A for ; Tue, 9 Nov 2021 07:53:02 +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 1AEA045894; Tue, 9 Nov 2021 07:52:56 +0100 (CET) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Tue, 9 Nov 2021 07:52:47 +0100 Message-Id: <20211109065253.980304-11-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211109065253.980304-1-dietmar@proxmox.com> References: <20211109065253.980304-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.509 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: [pbs-devel] [PATCH proxmox 5/7] RateLimiter: avoid panic in time computations X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2021 06:53:10 -0000 --- proxmox-http/src/client/rate_limiter.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/proxmox-http/src/client/rate_limiter.rs b/proxmox-http/src/client/rate_limiter.rs index 4742387..677dfb1 100644 --- a/proxmox-http/src/client/rate_limiter.rs +++ b/proxmox-http/src/client/rate_limiter.rs @@ -36,7 +36,7 @@ impl RateLimiter { /// Returns the average rate (since `start_time`) pub fn average_rate(&self, current_time: Instant) -> f64 { - let time_diff = (current_time - self.start_time).as_secs_f64(); + let time_diff = current_time.saturating_duration_since(self.start_time).as_secs_f64(); if time_diff <= 0.0 { 0.0 } else { @@ -45,12 +45,15 @@ impl RateLimiter { } fn refill_bucket(&mut self, current_time: Instant) { - let time_diff = (current_time - self.last_update).as_nanos(); + let time_diff = match current_time.checked_duration_since(self.last_update) { + Some(duration) => duration.as_nanos(), + None => { + //log::error!("update_time: got negative time diff"); + return; + } + }; - if time_diff <= 0 { - //log::error!("update_time: got negative time diff"); - return; - } + if time_diff == 0 { return; } self.last_update = current_time; -- 2.30.2