The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7147
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From 0dcbce05dca760d77e8f4cc1eab2243f4a58577f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Mon, 6 Apr 2020 17:53:49 -0400
Subject: [PATCH] lxd/patches: Fix snapshot migration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
lxd/patches.go | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lxd/patches.go b/lxd/patches.go
index 10b30e995d..52f26a9e11 100644
--- a/lxd/patches.go
+++ b/lxd/patches.go
@@ -10,6 +10,7 @@ import (
"strconv"
"strings"
"syscall"
+ "time"
"github.com/pkg/errors"
"golang.org/x/sys/unix"
@@ -657,7 +658,7 @@ func upgradeFromStorageTypeBtrfs(name string, d *Daemon,
defaultPoolName string,
}
} else if err == db.ErrNoSuchObject {
// Insert storage volumes for containers into
the database.
- _, err :=
d.cluster.StoragePoolVolumeCreate("default", cs, "",
db.StoragePoolVolumeTypeContainer, poolID, snapshotPoolVolumeConfig)
+ _, err :=
d.cluster.StoragePoolVolumeSnapshotCreate("default", cs, "",
db.StoragePoolVolumeTypeContainer, poolID, snapshotPoolVolumeConfig,
time.Time{})
if err != nil {
logger.Errorf("Could not insert a
storage volume for snapshot \"%s\"", cs)
return err
@@ -976,7 +977,7 @@ func upgradeFromStorageTypeDir(name string, d *Daemon,
defaultPoolName string, d
}
} else if err == db.ErrNoSuchObject {
// Insert storage volumes for containers into the
database.
- _, err := d.cluster.StoragePoolVolumeCreate("default",
cs, "", db.StoragePoolVolumeTypeContainer, poolID, snapshotPoolVolumeConfig)
+ _, err :=
d.cluster.StoragePoolVolumeSnapshotCreate("default", cs, "",
db.StoragePoolVolumeTypeContainer, poolID, snapshotPoolVolumeConfig,
time.Time{})
if err != nil {
logger.Errorf("Could not insert a storage
volume for snapshot \"%s\"", cs)
return err
@@ -1329,7 +1330,7 @@ func upgradeFromStorageTypeLvm(name string, d *Daemon,
defaultPoolName string, d
}
} else if err == db.ErrNoSuchObject {
// Insert storage volumes for containers into
the database.
- _, err :=
d.cluster.StoragePoolVolumeCreate("default", ct, "",
db.StoragePoolVolumeTypeContainer, poolID, snapshotPoolVolumeConfig)
+ _, err :=
d.cluster.StoragePoolVolumeSnapshotCreate("default", cs, "",
db.StoragePoolVolumeTypeContainer, poolID, snapshotPoolVolumeConfig,
time.Time{})
if err != nil {
logger.Errorf("Could not insert a
storage volume for snapshot \"%s\"", cs)
return err
@@ -1790,7 +1791,7 @@ func upgradeFromStorageTypeZfs(name string, d *Daemon,
defaultPoolName string, d
}
} else if err == db.ErrNoSuchObject {
// Insert storage volumes for containers into
the database.
- _, err :=
d.cluster.StoragePoolVolumeCreate("default", cs, "",
db.StoragePoolVolumeTypeContainer, poolID, snapshotPoolVolumeConfig)
+ _, err :=
d.cluster.StoragePoolVolumeSnapshotCreate("default", cs, "",
db.StoragePoolVolumeTypeContainer, poolID, snapshotPoolVolumeConfig,
time.Time{})
if err != nil {
logger.Errorf("Could not insert a
storage volume for snapshot \"%s\"", cs)
return err
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
