From 6fd3f57f4013e0a46e4dc077bdce1fac38e98528 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 30 Mar 2021 22:42:23 +0200 Subject: [PATCH] rbd: set kmsID in reserveSnap() Signed-off-by: Niels de Vos --- internal/rbd/rbd_journal.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/rbd/rbd_journal.go b/internal/rbd/rbd_journal.go index 0d2f4ffa8..72e28c7b3 100644 --- a/internal/rbd/rbd_journal.go +++ b/internal/rbd/rbd_journal.go @@ -351,9 +351,14 @@ func reserveSnap(ctx context.Context, rbdSnap *rbdSnapshot, rbdVol *rbdVolume, c } defer j.Destroy() + kmsID := "" + if rbdVol.isEncrypted() { + kmsID = rbdVol.encryption.GetID() + } + rbdSnap.ReservedID, rbdSnap.RbdSnapName, err = j.ReserveName( ctx, rbdSnap.JournalPool, journalPoolID, rbdSnap.Pool, imagePoolID, - rbdSnap.RequestName, rbdSnap.NamePrefix, rbdVol.RbdImageName, "", rbdSnap.ReservedID, rbdVol.Owner) + rbdSnap.RequestName, rbdSnap.NamePrefix, rbdVol.RbdImageName, kmsID, rbdSnap.ReservedID, rbdVol.Owner) if err != nil { return err }