From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] fix #4301: correctly pass rate limit parameters to API
Date: Thu, 20 Oct 2022 13:37:31 +0200 [thread overview]
Message-ID: <20221020113731.266248-1-s.hanreich@proxmox.com> (raw)
With the old code the rate limit parameters got passed in their own
dictionary under the limit key, but the API expects the rate-limit
settings as top-level keys. This commit correctly sets the rate-limit
parameters so the API actually uses them.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
src/bin/proxmox-backup-manager.rs | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs
index 58e7e33a..cdd1037d 100644
--- a/src/bin/proxmox-backup-manager.rs
+++ b/src/bin/proxmox-backup-manager.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
use std::io::{self, Write};
use std::str::FromStr;
-use anyhow::Error;
+use anyhow::{Error, format_err};
use serde_json::{json, Value};
use proxmox_router::{cli::*, RpcEnvironment};
@@ -297,7 +297,6 @@ async fn pull_datastore(
"store": store,
"remote": remote,
"remote-store": remote_store,
- "limit": limit,
});
if remote_ns.is_some() {
@@ -320,6 +319,17 @@ async fn pull_datastore(
args["remove-vanished"] = Value::from(remove_vanished);
}
+ let args_map = args
+ .as_object_mut()
+ .ok_or_else(|| format_err!("args is not an Object"))?;
+
+ let mut limit_json = json!(limit);
+ let limit_map = limit_json
+ .as_object_mut()
+ .ok_or_else(|| format_err!("limit is not an Object"))?;
+
+ args_map.append(limit_map);
+
let result = client.post("api2/json/pull", Some(args)).await?;
view_task_result(&client, result, &output_format).await?;
--
2.30.2
next reply other threads:[~2022-10-20 11:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-20 11:37 Stefan Hanreich [this message]
2022-10-20 12:48 ` Wolfgang Bumiller
2022-10-20 12:59 ` Stefan Hanreich
2022-10-20 13:44 ` Wolfgang Bumiller
2022-10-20 13:50 ` Stefan Hanreich
2022-10-20 14:06 ` Wolfgang Bumiller
2022-10-20 14:11 ` Stefan Hanreich
2022-10-20 14:20 Wolfgang Bumiller
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=20221020113731.266248-1-s.hanreich@proxmox.com \
--to=s.hanreich@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox