Merge branch '232-lvm-mount-points' into 'master'

agneum · agneum · commit e20e4ff66546 · 2021-02-08T09:58:05.000Z
fix: remove a sub-directory from the path of LVM mount points (#232) Closes #232 See merge request postgres-ai/database-lab!258
diff --git a/pkg/services/provision/thinclones/lvm/lvm.go b/pkg/services/provision/thinclones/lvm/lvm.go
@@ -42,7 +42,7 @@ type ListEntry struct {
 }
 
 // CreateVolume creates LVM volume.
-func CreateVolume(r runners.Runner, vg, lv, name, mountDir, dataSubDir string) error {
+func CreateVolume(r runners.Runner, vg, lv, name, mountDir string) error {
 	fullName := getFullName(vg, name)
 
 	volumeCreateCmd := "lvcreate --snapshot " +
@@ -54,7 +54,7 @@ func CreateVolume(r runners.Runner, vg, lv, name, mountDir, dataSubDir string) e
 		return errors.Wrap(err, "failed to create a volume")
 	}
 
-	fullMountDir := getFullMountDir(mountDir, name, dataSubDir)
+	fullMountDir := getFullMountDir(mountDir, name)
 	mountCmd := "mkdir -p " + fullMountDir + " && " +
 		"mount /dev/" + fullName + " " + fullMountDir
 
@@ -67,10 +67,10 @@ func CreateVolume(r runners.Runner, vg, lv, name, mountDir, dataSubDir string) e
 }
 
 // RemoveVolume removes LVM volume.
-func RemoveVolume(r runners.Runner, vg, lv, name, mountDir, dataSubDir string) error {
+func RemoveVolume(r runners.Runner, vg, _, name, mountDir string) error {
 	fullName := getFullName(vg, name)
 
-	unmountCmd := "umount " + getFullMountDir(mountDir, name, dataSubDir)
+	unmountCmd := "umount " + getFullMountDir(mountDir, name)
 
 	_, err := r.Run(unmountCmd, true)
 	if err != nil {
@@ -116,6 +116,6 @@ func getFullName(vg, name string) string {
 	return fmt.Sprintf("%s/%s", vg, name)
 }
 
-func getFullMountDir(mountDir, name, dataSubDir string) string {
-	return fmt.Sprintf("%s/%s/%s", mountDir, name, dataSubDir)
+func getFullMountDir(mountDir, name string) string {
+	return fmt.Sprintf("%s/%s", mountDir, name)
 }
diff --git a/pkg/services/provision/thinclones/lvm/lvmanager.go b/pkg/services/provision/thinclones/lvm/lvmanager.go
@@ -48,12 +48,12 @@ func (m *LVManager) Pool() *resources.Pool {
 
 // CreateClone creates a new volume.
 func (m *LVManager) CreateClone(name, _ string) error {
-	return CreateVolume(m.runner, m.volumeGroup, m.logicalVolume, name, m.pool.ClonesDir(), m.pool.DataSubDir)
+	return CreateVolume(m.runner, m.volumeGroup, m.logicalVolume, name, m.pool.ClonesDir())
 }
 
 // DestroyClone destroys volumes.
 func (m *LVManager) DestroyClone(name string) error {
-	return RemoveVolume(m.runner, m.volumeGroup, m.logicalVolume, name, m.pool.ClonesDir(), m.pool.DataSubDir)
+	return RemoveVolume(m.runner, m.volumeGroup, m.logicalVolume, name, m.pool.ClonesDir())
 }
 
 // ListClonesNames returns a list of clone names.

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ type ListEntry struct {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// CreateVolume creates LVM volume.`
`45`		`-func CreateVolume(r runners.Runner, vg, lv, name, mountDir, dataSubDir string) error {`
	`45`	`+func CreateVolume(r runners.Runner, vg, lv, name, mountDir string) error {`
`46`	`46`	`fullName := getFullName(vg, name)`
`47`	`47`
`48`	`48`	`volumeCreateCmd := "lvcreate --snapshot " +`
`@@ -54,7 +54,7 @@ func CreateVolume(r runners.Runner, vg, lv, name, mountDir, dataSubDir string) e`
`54`	`54`	`return errors.Wrap(err, "failed to create a volume")`
`55`	`55`	`}`
`56`	`56`
`57`		`- fullMountDir := getFullMountDir(mountDir, name, dataSubDir)`
	`57`	`+ fullMountDir := getFullMountDir(mountDir, name)`
`58`	`58`	`mountCmd := "mkdir -p " + fullMountDir + " && " +`
`59`	`59`	`"mount /dev/" + fullName + " " + fullMountDir`
`60`	`60`
`@@ -67,10 +67,10 @@ func CreateVolume(r runners.Runner, vg, lv, name, mountDir, dataSubDir string) e`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// RemoveVolume removes LVM volume.`
`70`		`-func RemoveVolume(r runners.Runner, vg, lv, name, mountDir, dataSubDir string) error {`
	`70`	`+func RemoveVolume(r runners.Runner, vg, _, name, mountDir string) error {`
`71`	`71`	`fullName := getFullName(vg, name)`
`72`	`72`
`73`		`- unmountCmd := "umount " + getFullMountDir(mountDir, name, dataSubDir)`
	`73`	`+ unmountCmd := "umount " + getFullMountDir(mountDir, name)`
`74`	`74`
`75`	`75`	`_, err := r.Run(unmountCmd, true)`
`76`	`76`	`if err != nil {`
`@@ -116,6 +116,6 @@ func getFullName(vg, name string) string {`
`116`	`116`	`return fmt.Sprintf("%s/%s", vg, name)`
`117`	`117`	`}`
`118`	`118`
`119`		`-func getFullMountDir(mountDir, name, dataSubDir string) string {`
`120`		`- return fmt.Sprintf("%s/%s/%s", mountDir, name, dataSubDir)`
	`119`	`+func getFullMountDir(mountDir, name string) string {`
	`120`	`+ return fmt.Sprintf("%s/%s", mountDir, name)`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@ func (m LVManager) Pool() resources.Pool {`
`48`	`48`
`49`	`49`	`// CreateClone creates a new volume.`
`50`	`50`	`func (m *LVManager) CreateClone(name, _ string) error {`
`51`		`- return CreateVolume(m.runner, m.volumeGroup, m.logicalVolume, name, m.pool.ClonesDir(), m.pool.DataSubDir)`
	`51`	`+ return CreateVolume(m.runner, m.volumeGroup, m.logicalVolume, name, m.pool.ClonesDir())`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// DestroyClone destroys volumes.`
`55`	`55`	`func (m *LVManager) DestroyClone(name string) error {`
`56`		`- return RemoveVolume(m.runner, m.volumeGroup, m.logicalVolume, name, m.pool.ClonesDir(), m.pool.DataSubDir)`
	`56`	`+ return RemoveVolume(m.runner, m.volumeGroup, m.logicalVolume, name, m.pool.ClonesDir())`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// ListClonesNames returns a list of clone names.`