mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-18 04:10:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: move encryptDevice() to a method of rbdVolume

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-02-22 17:20:11 +01:00 committed by mergify[bot]
parent fb065b0f39
commit cf6dae86e9
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/rbd/encryption.go
View File

@ -101,6 +101,29 @@ func (rv *rbdVolume) setupEncryption(ctx context.Context) error {
return nil return nil
} }
func (rv *rbdVolume) encryptDevice(ctx context.Context, devicePath string) error {
passphrase, err := util.GetCryptoPassphrase(rv.VolID, rv.KMS)
if err != nil {
util.ErrorLog(ctx, "failed to get crypto passphrase for %s: %v",
rv.String(), err)
return err
}
if err = util.EncryptVolume(ctx, devicePath, passphrase); err != nil {
err = fmt.Errorf("failed to encrypt volume %s: %w", rv.String(), err)
util.ErrorLog(ctx, err.Error())
return err
}
err = rv.ensureEncryptionMetadataSet(rbdImageEncrypted)
if err != nil {
util.ErrorLog(ctx, err.Error())
return err
}
return nil
}
func (rv *rbdVolume) openEncryptedDevice(ctx context.Context, devicePath string) (string, error) { func (rv *rbdVolume) openEncryptedDevice(ctx context.Context, devicePath string) (string, error) {
passphrase, err := util.GetCryptoPassphrase(rv.VolID, rv.KMS) passphrase, err := util.GetCryptoPassphrase(rv.VolID, rv.KMS)
if err != nil { if err != nil {

25
internal/rbd/nodeserver.go
View File

@ -818,7 +818,7 @@ func (ns *NodeServer) processEncryptedDevice(ctx context.Context, volOptions *rb
switch existingFormat { switch existingFormat {
case "": case "":
err = encryptDevice(ctx, volOptions, devicePath) err = volOptions.encryptDevice(ctx, devicePath)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to encrypt rbd image %s: %w", imageSpec, err) return "", fmt.Errorf("failed to encrypt rbd image %s: %w", imageSpec, err)
} }
@ -846,29 +846,6 @@ func (ns *NodeServer) processEncryptedDevice(ctx context.Context, volOptions *rb
return devicePath, nil return devicePath, nil
} }
func encryptDevice(ctx context.Context, rbdVol *rbdVolume, devicePath string) error {
passphrase, err := util.GetCryptoPassphrase(rbdVol.VolID, rbdVol.KMS)
if err != nil {
util.ErrorLog(ctx, "failed to get crypto passphrase for %s: %v",
rbdVol, err)
return err
}
if err = util.EncryptVolume(ctx, devicePath, passphrase); err != nil {
err = fmt.Errorf("failed to encrypt volume %s: %w", rbdVol, err)
util.ErrorLog(ctx, err.Error())
return err
}
err = rbdVol.ensureEncryptionMetadataSet(rbdImageEncrypted)
if err != nil {
util.ErrorLog(ctx, err.Error())
return err
}
return nil
}
// xfsSupportsReflink checks if mkfs.xfs supports the "-m reflink=0|1" // xfsSupportsReflink checks if mkfs.xfs supports the "-m reflink=0|1"
// argument. In case it is supported, return true. // argument. In case it is supported, return true.
func (ns *NodeServer) xfsSupportsReflink() bool { func (ns *NodeServer) xfsSupportsReflink() bool {