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 151A675113
for <pbs-devel@lists.proxmox.com>; Thu, 2 Jun 2022 16:27:47 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 0B5D95CD8
for <pbs-devel@lists.proxmox.com>; Thu, 2 Jun 2022 16:27:47 +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))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id C5A125CCD
for <pbs-devel@lists.proxmox.com>; Thu, 2 Jun 2022 16:27:45 +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 964D142ADA
for <pbs-devel@lists.proxmox.com>; Thu, 2 Jun 2022 16:27:45 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 2 Jun 2022 16:27:44 +0200
Message-Id: <20220602142744.548757-1-d.csapak@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.110 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. [datastore.rs]
Subject: [pbs-devel] [PATCH proxmox-backup] pbs-datastore: lookup: don't
create new ChunkStore on datastore reopen
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, 02 Jun 2022 14:27:47 -0000
When re-opening a datastore, e.g. because the config changed or the
last re-open was >60s ago, the chunkstore was also re-opened. Opening a
ChunkStore creates a new ProcessLocker, so re-opening a datastore had the
unintentional side-effect of potentially discarding the existing
ProcessLocker. Any contained shared locks are lost in turn.
To fix this, reuse an old, existing ChunkStore (and its ProcessLocker)
on the re-opened datastore, since only the datastore config should be
reloaded, and the ChunkStore path is not updatable over our API anyway.
If a user manually edited the path in the config, a daemon restart must
happen for this change to take effect.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
pbs-datastore/src/datastore.rs | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index ef21cad0..f4bc45ea 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -145,16 +145,20 @@ impl DataStore {
let mut map = DATASTORE_MAP.lock().unwrap();
let entry = map.get(name);
- if let Some(datastore) = &entry {
+ // reuse chunk_store, we only want to reload the datastore config, and the path
+ // is normally not editable and requires a restart of the proxy
+ let chunk_store = if let Some(datastore) = &entry {
if datastore.last_generation == generation && now < (datastore.last_update + 60) {
return Ok(Arc::new(Self {
inner: Arc::clone(datastore),
operation,
}));
}
- }
+ Arc::clone(&datastore.chunk_store)
+ } else {
+ Arc::new(ChunkStore::open(name, &config.path)?)
+ };
- let chunk_store = ChunkStore::open(name, &config.path)?;
let datastore = DataStore::with_store_and_config(chunk_store, config, generation, now)?;
let datastore = Arc::new(datastore);
@@ -198,7 +202,12 @@ impl DataStore {
let name = config.name.clone();
let chunk_store = ChunkStore::open(&name, &config.path)?;
- let inner = Arc::new(Self::with_store_and_config(chunk_store, config, 0, 0)?);
+ let inner = Arc::new(Self::with_store_and_config(
+ Arc::new(chunk_store),
+ config,
+ 0,
+ 0,
+ )?);
if let Some(operation) = operation {
update_active_operations(&name, operation, 1)?;
@@ -208,7 +217,7 @@ impl DataStore {
}
fn with_store_and_config(
- chunk_store: ChunkStore,
+ chunk_store: Arc<ChunkStore>,
config: DataStoreConfig,
last_generation: usize,
last_update: i64,
@@ -235,7 +244,7 @@ impl DataStore {
let chunk_order = tuning.chunk_order.unwrap_or(ChunkOrder::Inode);
Ok(DataStoreImpl {
- chunk_store: Arc::new(chunk_store),
+ chunk_store,
gc_mutex: Mutex::new(()),
last_gc_status: Mutex::new(gc_status),
verify_new: config.verify_new.unwrap_or(false),
--
2.30.2