[lxc-devel] [lxd/master] lxd/migration: Use current idmap instead of next

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 500 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20181030/8d48b0a3/attachment.bin>
-------------- next part --------------
From 33818664f7a2ae4dfa598a537d3a856d0be8ed82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 29 Oct 2018 23:50:05 -0400
Subject: [PATCH] lxd/migration: Use current idmap instead of next
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Doesn't do us any good advertising what the map should be instead of
what it actually is, so let's use the right one instead.

Closes #5205

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/migrate_container.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxd/migrate_container.go b/lxd/migrate_container.go
index 8dc76acc0c..67b619c327 100644
--- a/lxd/migrate_container.go
+++ b/lxd/migrate_container.go
@@ -336,7 +336,7 @@ func (s *migrationSourceWs) Do(migrateOp *operation) error {
 
 	idmaps := make([]*migration.IDMapType, 0)
 
-	idmapset, err := s.container.IdmapSet()
+	idmapset, err := s.container.LastIdmapSet()
 	if err != nil {
 		return err
 	}