[pbs-devel] [PATCH proxmox-backup v2 2/4] api/tape/inventory: optionally try to restore catalogs

Wolfgang Bumiller w.bumiller at proxmox.com
Tue Oct 18 10:18:08 CEST 2022


On Thu, Oct 06, 2022 at 01:36:08PM +0200, Dominik Csapak wrote:
> in a disaster recovery case, it is useful to not only re-invetorize
> the labels + media-sets, but also to try to recover the catalogs
> from the tape (to know whats on there). This adds an option to
> the inventory api call that tries to do a fast catalog restore
> from each tape to be inventorized.
> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  src/api2/tape/drive.rs | 41 +++++++++++++++++++++++++++++++++++------
>  1 file changed, 35 insertions(+), 6 deletions(-)
> 
> diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs
> index 28c0f0f5..3394afe9 100644
> --- a/src/api2/tape/drive.rs
> +++ b/src/api2/tape/drive.rs
> @@ -848,6 +848,13 @@ pub async fn inventory(drive: String) -> Result<Vec<LabelUuidMap>, Error> {
>              "read-all-labels": {
>                  description: "Load all tapes and try read labels (even if already inventoried)",
>                  type: bool,
> +                default: false,
> +                optional: true,
> +            },
> +            "catalog": {
> +                description: "Restore the catalog from tape.",
> +                type: bool,
> +                default: false,
>                  optional: true,

If we're adding default+optional here...

>              },
>          },
> @@ -867,10 +874,13 @@ pub async fn inventory(drive: String) -> Result<Vec<LabelUuidMap>, Error> {
>  /// then loads any unknown media into the drive, reads the label, and
>  /// store the result to the media database.
>  ///
> +/// If `catalog` is true, also tries to restore the catalog from tape.
> +///
>  /// Note: This updates the media online status.
>  pub fn update_inventory(
>      drive: String,
>      read_all_labels: Option<bool>,
> +    catalog: Option<bool>,

...let's just drop the `Option` bit here in both parameters...

>      rpcenv: &mut dyn RpcEnvironment,
>  ) -> Result<Value, Error> {
>      let upid_str = run_drive_worker(
> @@ -889,6 +899,8 @@ pub fn update_inventory(
>              let mut inventory = Inventory::load(TAPE_STATUS_DIR)?;
>  
>              update_changer_online_status(&config, &mut inventory, &changer_name, &label_text_list)?;
> +            let catalog = catalog.unwrap_or(false);
> +            let read_all_labels = read_all_labels.unwrap_or(false);

... Then we don't need to repeat (and potentially mess up in the future)
the defaults here. ^





More information about the pbs-devel mailing list