technofab/zfs-localpv
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/zfs-localpv.git synced 2025-12-12 06:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(refactor): move btrfs code out of zfs package

Browse source 
Signed-off-by: Pawan <pawan@mayadata.io>
This commit is contained in:
Pawan 2020-11-23 18:36:49 +05:30 • committed by Kiran Mova
parent 3404bc032b
commit 935a544538
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

43
pkg/zfs/btrfs_util.go
View file

@ -1,43 +0,0 @@
/*
Copyright 2020 The OpenEBS Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package zfs
import (
"os/exec"
"k8s.io/klog"
)
/*
* We have to generate a new UUID for the cloned volumes with btrfs filesystem
* otherwise system will mount the same volume if UUID is same. Here, since cloned
* volume refers to the same block because of the way ZFS clone works, it will
* also have the same UUID.
*/
func btrfsGenerateUUID(volume string) error {
device := ZFSDevPath + volume
// for mounting the cloned volume for btrfs, a new UUID has to be generated
cmd := exec.Command("btrfstune", "-f", "-u", device)
out, err := cmd.CombinedOutput()
if err != nil {
klog.Errorf("btrfs: uuid generate failed %s error: %s", volume, string(out))
return err
}
klog.Infof("btrfs: generated UUID for the cloned volume %s \n %v", volume, string(out))
return nil
}

7
pkg/zfs/zfs_util.go
View file

@ -23,6 +23,7 @@ import (
"fmt"
apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1"
"github.com/openebs/zfs-localpv/pkg/btrfs"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/klog"
"strings"
@ -442,7 +443,8 @@ func CreateClone(vol *apis.ZFSVolume) error {
return xfsGenerateUUID(volume)
}
if vol.Spec.FsType == "btrfs" {
return btrfsGenerateUUID(volume)
device := ZFSDevPath + volume
return btrfs.GenerateUUID(device)
}
return nil
}
@ -815,7 +817,8 @@ func CreateRestore(rstr *apis.ZFSRestore) error {
return xfsGenerateUUID(volume)
}
if vol.Spec.FsType == "btrfs" {
return btrfsGenerateUUID(volume)
device := ZFSDevPath + volume
return btrfs.GenerateUUID(device)
}
return nil