Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Nov 24, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/zfs/btrfs_util.go → pkg/btrfs/btrfs_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package zfs
package btrfs

import (
"os/exec"
Expand All @@ -28,16 +28,16 @@ import (
* 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

// GenerateUUID generates a new btrfs UUID for the given device
func GenerateUUID(device string) error {
// 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))
klog.Errorf("btrfs: uuid generate failed for device %s error: %s", device, string(out))
return err
}
klog.Infof("btrfs: generated UUID for the cloned volume %s \n %v", volume, string(out))
klog.Infof("btrfs: generated UUID for the device %s \n %v", device, string(out))
return nil
}
7 changes: 5 additions & 2 deletions pkg/zfs/zfs_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down