From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
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 970A97187F
for <pbs-devel@lists.proxmox.com>; Thu, 19 May 2022 12:08:29 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 83EF56763
for <pbs-devel@lists.proxmox.com>; Thu, 19 May 2022 12:08:29 +0200 (CEST)
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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 9BBEB66FC
for <pbs-devel@lists.proxmox.com>; Thu, 19 May 2022 12:08:27 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B4F1643734
for <pbs-devel@lists.proxmox.com>; Thu, 19 May 2022 12:08:21 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 19 May 2022 12:08:16 +0200
Message-Id: <20220519100820.1829147-2-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220519100820.1829147-1-d.csapak@proxmox.com>
References: <20220519100820.1829147-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.117 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
T_SCC_BODY_TEXT_LINE -0.01 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [inventory.rs, self.map]
Subject: [pbs-devel] [PATCH proxmox-backup 1/5] tape/inventory: make
'load_media_db' a method
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 19 May 2022 10:08:29 -0000
and use self.inventory_path. This is only used internally (not pub) so there
is no need to have it as a static function.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/tape/inventory.rs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/tape/inventory.rs b/src/tape/inventory.rs
index c3bd4606..c270ffcf 100644
--- a/src/tape/inventory.rs
+++ b/src/tape/inventory.rs
@@ -112,7 +112,7 @@ impl Inventory {
/// Reload the database
pub fn reload(&mut self) -> Result<(), Error> {
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
self.update_helpers();
Ok(())
}
@@ -140,8 +140,8 @@ impl Inventory {
open_backup_lockfile(&self.lockfile_path, None, true)
}
- fn load_media_db(path: &Path) -> Result<BTreeMap<Uuid, MediaStateEntry>, Error> {
- let data = file_get_json(path, Some(json!([])))?;
+ fn load_media_db(&self) -> Result<BTreeMap<Uuid, MediaStateEntry>, Error> {
+ let data = file_get_json(&self.inventory_path, Some(json!([])))?;
let media_list: Vec<MediaStateEntry> = serde_json::from_value(data)?;
let mut map = BTreeMap::new();
@@ -177,7 +177,7 @@ impl Inventory {
/// Stores a single MediaID persistently
pub fn store(&mut self, mut media_id: MediaId, clear_media_status: bool) -> Result<(), Error> {
let _lock = self.lock()?;
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
let uuid = media_id.label.uuid.clone();
@@ -217,7 +217,7 @@ impl Inventory {
/// Remove a single media persistently
pub fn remove_media(&mut self, uuid: &Uuid) -> Result<(), Error> {
let _lock = self.lock()?;
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
self.map.remove(uuid);
self.update_helpers();
self.replace_file()?;
@@ -659,7 +659,7 @@ impl Inventory {
// Lock database, reload database, set status, store database
fn set_media_status(&mut self, uuid: &Uuid, status: Option<MediaStatus>) -> Result<(), Error> {
let _lock = self.lock()?;
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
if let Some(entry) = self.map.get_mut(uuid) {
entry.status = status;
self.update_helpers();
@@ -697,7 +697,7 @@ impl Inventory {
location: Option<MediaLocation>,
) -> Result<(), Error> {
let _lock = self.lock()?;
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
if let Some(entry) = self.map.get_mut(uuid) {
entry.location = location;
self.update_helpers();
@@ -721,7 +721,7 @@ impl Inventory {
/// Update online status
pub fn update_online_status(&mut self, online_map: &OnlineStatusMap) -> Result<(), Error> {
let _lock = self.lock()?;
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
for (uuid, entry) in self.map.iter_mut() {
if let Some(changer_name) = online_map.lookup_changer(uuid) {
--
2.30.2