|
 |
b971b8 |
From 7f5c44bfd2b6290e142380775b6a6205ccc43840 Mon Sep 17 00:00:00 2001
|
|
|
b971b8 |
Message-Id: <7f5c44bfd2b6290e142380775b6a6205ccc43840@dist-git>
|
|
|
b971b8 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
b971b8 |
Date: Tue, 23 Jun 2020 12:23:37 +0200
|
|
|
b971b8 |
Subject: [PATCH] conf: backup: Store incremental backup checkpoint name
|
|
|
b971b8 |
per-disk
|
|
|
b971b8 |
MIME-Version: 1.0
|
|
|
b971b8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
b971b8 |
Content-Transfer-Encoding: 8bit
|
|
|
b971b8 |
|
|
|
b971b8 |
In preparation to allow heterogenous backups store the 'incremental'
|
|
|
b971b8 |
field per-disk and fill it by default from the per-backup field.
|
|
|
b971b8 |
|
|
|
b971b8 |
Having this will be important once we'll want to allow incremental
|
|
|
b971b8 |
backup working while hotplugging a new disk.
|
|
|
b971b8 |
|
|
|
b971b8 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
b971b8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
b971b8 |
(cherry picked from commit b8295160c36e555d8bcaef5015d0c1e3ae85fb17)
|
|
|
b971b8 |
https://bugzilla.redhat.com/show_bug.cgi?id=1804593
|
|
|
b971b8 |
Message-Id: <ee6c31ce5f3400523559793fe40e789656068f7c.1592906423.git.pkrempa@redhat.com>
|
|
|
b971b8 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
b971b8 |
---
|
|
|
b971b8 |
src/conf/backup_conf.c | 8 ++++++++
|
|
|
b971b8 |
src/conf/backup_conf.h | 1 +
|
|
|
b971b8 |
2 files changed, 9 insertions(+)
|
|
|
b971b8 |
|
|
|
b971b8 |
diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c
|
|
|
b971b8 |
index 64c8f6cc09..58fb3ec759 100644
|
|
|
b971b8 |
--- a/src/conf/backup_conf.c
|
|
|
b971b8 |
+++ b/src/conf/backup_conf.c
|
|
|
b971b8 |
@@ -71,6 +71,7 @@ virDomainBackupDefFree(virDomainBackupDefPtr def)
|
|
|
b971b8 |
virDomainBackupDiskDefPtr disk = def->disks + i;
|
|
|
b971b8 |
|
|
|
b971b8 |
g_free(disk->name);
|
|
|
b971b8 |
+ g_free(disk->incremental);
|
|
|
b971b8 |
g_free(disk->exportname);
|
|
|
b971b8 |
g_free(disk->exportbitmap);
|
|
|
b971b8 |
virObjectUnref(disk->store);
|
|
|
b971b8 |
@@ -503,5 +504,12 @@ virDomainBackupAlignDisks(virDomainBackupDefPtr def,
|
|
|
b971b8 |
}
|
|
|
b971b8 |
}
|
|
|
b971b8 |
|
|
|
b971b8 |
+ for (i = 0; i < def->ndisks; i++) {
|
|
|
b971b8 |
+ virDomainBackupDiskDefPtr backupdisk = &def->disks[i];
|
|
|
b971b8 |
+
|
|
|
b971b8 |
+ if (def->incremental && !backupdisk->incremental)
|
|
|
b971b8 |
+ backupdisk->incremental = g_strdup(def->incremental);
|
|
|
b971b8 |
+ }
|
|
|
b971b8 |
+
|
|
|
b971b8 |
return 0;
|
|
|
b971b8 |
}
|
|
|
b971b8 |
diff --git a/src/conf/backup_conf.h b/src/conf/backup_conf.h
|
|
|
b971b8 |
index 672fd52ee7..7ce7a46ad4 100644
|
|
|
b971b8 |
--- a/src/conf/backup_conf.h
|
|
|
b971b8 |
+++ b/src/conf/backup_conf.h
|
|
|
b971b8 |
@@ -51,6 +51,7 @@ typedef virDomainBackupDiskDef *virDomainBackupDiskDefPtr;
|
|
|
b971b8 |
struct _virDomainBackupDiskDef {
|
|
|
b971b8 |
char *name; /* name matching the
|
|
|
b971b8 |
virTristateBool backup; /* whether backup is requested */
|
|
|
b971b8 |
+ char *incremental; /* name of the starting point checkpoint of an incremental backup */
|
|
|
b971b8 |
char *exportname; /* name of the NBD export for pull mode backup */
|
|
|
b971b8 |
char *exportbitmap; /* name of the bitmap exposed in NBD for pull mode backup */
|
|
|
b971b8 |
|
|
|
b971b8 |
--
|
|
|
b971b8 |
2.27.0
|
|
|
b971b8 |
|