From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/4] api2/confif/datastore: add create datastore api call in a worker
Date: Tue, 1 Jun 2021 14:13:48 +0200 [thread overview]
Message-ID: <20210601121350.19919-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210601121350.19919-1-d.csapak@proxmox.com>
so that longer running creates (e.g. a slow storage), does not
run in a timeout and we can follow its creation
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/config/datastore.rs | 107 ++++++++++++++++++++++++++++++++++-
www/window/DataStoreEdit.js | 3 +-
2 files changed, 108 insertions(+), 2 deletions(-)
diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
index 33e76b27..16ac030f 100644
--- a/src/api2/config/datastore.rs
+++ b/src/api2/config/datastore.rs
@@ -13,7 +13,7 @@ use crate::backup::*;
use crate::config::cached_user_info::CachedUserInfo;
use crate::config::datastore::{self, DataStoreConfig, DIR_NAME_SCHEMA};
use crate::config::acl::{PRIV_DATASTORE_ALLOCATE, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_MODIFY};
-use crate::server::jobstate;
+use crate::server::{jobstate, WorkerTask};
#[api(
input: {
@@ -143,6 +143,110 @@ pub fn create_datastore(param: Value) -> Result<(), Error> {
Ok(())
}
+#[api(
+ protected: true,
+ input: {
+ properties: {
+ name: {
+ schema: DATASTORE_SCHEMA,
+ },
+ path: {
+ schema: DIR_NAME_SCHEMA,
+ },
+ comment: {
+ optional: true,
+ schema: SINGLE_LINE_COMMENT_SCHEMA,
+ },
+ "notify-user": {
+ optional: true,
+ type: Userid,
+ },
+ "notify": {
+ optional: true,
+ schema: DATASTORE_NOTIFY_STRING_SCHEMA,
+ },
+ "gc-schedule": {
+ optional: true,
+ schema: GC_SCHEDULE_SCHEMA,
+ },
+ "prune-schedule": {
+ optional: true,
+ schema: PRUNE_SCHEDULE_SCHEMA,
+ },
+ "keep-last": {
+ optional: true,
+ schema: PRUNE_SCHEMA_KEEP_LAST,
+ },
+ "keep-hourly": {
+ optional: true,
+ schema: PRUNE_SCHEMA_KEEP_HOURLY,
+ },
+ "keep-daily": {
+ optional: true,
+ schema: PRUNE_SCHEMA_KEEP_DAILY,
+ },
+ "keep-weekly": {
+ optional: true,
+ schema: PRUNE_SCHEMA_KEEP_WEEKLY,
+ },
+ "keep-monthly": {
+ optional: true,
+ schema: PRUNE_SCHEMA_KEEP_MONTHLY,
+ },
+ "keep-yearly": {
+ optional: true,
+ schema: PRUNE_SCHEMA_KEEP_YEARLY,
+ },
+ },
+ },
+ access: {
+ permission: &Permission::Privilege(&["datastore"], PRIV_DATASTORE_ALLOCATE, false),
+ },
+)]
+/// Create new datastore config.
+pub fn create_datastore_worker(
+ param: Value,
+ rpcenv: &mut dyn RpcEnvironment,
+) -> Result<String, Error> {
+
+ let lock = open_file_locked(datastore::DATASTORE_CFG_LOCKFILE, std::time::Duration::new(10, 0), true)?;
+
+ let datastore: datastore::DataStoreConfig = serde_json::from_value(param)?;
+
+ let (mut config, _digest) = datastore::config()?;
+
+ if config.sections.get(&datastore.name).is_some() {
+ bail!("datastore '{}' already exists.", datastore.name);
+ }
+
+ let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
+
+ let upid_str = WorkerTask::new_thread(
+ "create-datastore",
+ Some(datastore.name.to_string()),
+ auth_id,
+ false,
+ move |_worker| {
+ let _lock = lock; // keep the lock
+ let path: PathBuf = datastore.path.clone().into();
+
+ let backup_user = crate::backup::backup_user()?;
+ let _store = ChunkStore::create(&datastore.name, path, backup_user.uid, backup_user.gid)?;
+
+ config.set_data(&datastore.name, "datastore", &datastore)?;
+
+ datastore::save_config(&config)?;
+
+ jobstate::create_state_file("prune", &datastore.name)?;
+ jobstate::create_state_file("garbage_collection", &datastore.name)?;
+
+ Ok(())
+ },
+ )?;
+
+ Ok(upid_str)
+}
+
#[api(
input: {
properties: {
@@ -438,4 +542,5 @@ const ITEM_ROUTER: Router = Router::new()
pub const ROUTER: Router = Router::new()
.get(&API_METHOD_LIST_DATASTORES)
.post(&API_METHOD_CREATE_DATASTORE)
+ .put(&API_METHOD_CREATE_DATASTORE_WORKER)
.match_all("name", &ITEM_ROUTER);
diff --git a/www/window/DataStoreEdit.js b/www/window/DataStoreEdit.js
index c2b2809f..34ab74b9 100644
--- a/www/window/DataStoreEdit.js
+++ b/www/window/DataStoreEdit.js
@@ -75,6 +75,8 @@ Ext.define('PBS.DataStoreEdit', {
isAdd: true,
bodyPadding: 0,
+ method: 'PUT',
+ showProgress: true,
cbindData: function(initialConfig) {
var me = this;
@@ -87,7 +89,6 @@ Ext.define('PBS.DataStoreEdit', {
me.defaultFocus = 'textfield[name=comment]';
}
me.url = name ? baseurl + '/' + name : baseurl;
- me.method = name ? 'PUT' : 'POST';
me.scheduleValue = name ? null : 'daily';
me.autoLoad = !!name;
return {};
--
2.20.1
next prev parent reply other threads:[~2021-06-01 12:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-01 12:13 [pbs-devel] [PATCH proxmox-backup 0/4] improve datastore removal/creation Dominik Csapak
2021-06-01 12:13 ` [pbs-devel] [PATCH proxmox-backup 1/4] proxmox-backup-proxy: fix leftover references on datastore removal Dominik Csapak
2021-06-01 14:25 ` Thomas Lamprecht
2021-06-01 12:13 ` Dominik Csapak [this message]
2021-06-01 14:33 ` [pbs-devel] [PATCH proxmox-backup 2/4] api2/confif/datastore: add create datastore api call in a worker Thomas Lamprecht
2021-06-02 6:34 ` Dietmar Maurer
2021-06-01 12:13 ` [pbs-devel] [PATCH proxmox-backup 3/4] backup/chunk_store: optionally log progress on creation Dominik Csapak
2021-06-01 12:13 ` [pbs-devel] [PATCH proxmox-backup 4/4] ui: DataStoreList: add remove button Dominik Csapak
2021-06-01 14:37 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210601121350.19919-3-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal