opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 06:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(host-deployer): ensure the success of vgrenam

Browse Source
This commit is contained in:
rainzm
2021-09-16 17:43:19 +08:00
parent 454ebe49e1
commit a545ad10e1
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/diskutils/nbd/lvmutils.go
+11 -3
View File
@@ -120,8 +120,15 @@ func findVg(partDev string) (SVG, error) {
if err != nil {
return SVG{}, errors.Wrapf(err, "unable to exec command %q", command)
}
log.Debugf("command: %s\noutput: %s", command, output)
lines := strings.Split(strings.TrimSpace(string(output)), "\n")
log.Debugf("command: %s\noutptu: %s", command, output)
outputStr := string(output)
r := regexp.MustCompile("WARNING: Device mismatch detected for .* which is accessing .* instead of .*.")
ret := r.FindStringSubmatch(outputStr)
if len(ret) > 0 {
return SVG{}, fmt.Errorf("VG conflicts with the VG UUID of the host")
}
lines := strings.Split(strings.TrimSpace(outputStr), "\n")
if len(lines) <= 1 {
return SVG{}, fmt.Errorf("unable to find vg, output is %q", output)
}
@@ -176,6 +183,7 @@ func (p *SKVMGuestLVMPartition) FindPartitions() []*kvmpart.SKVMGuestDiskPartiti
log.Errorf("unable to readir /dev/%s: %v", p.vgname, err)
return nil
}
log.Debugf("unable to read dir '/dev/%s': %v", p.vgname, err)
// try /dev/mapper/{vgname}-{lvname}
lvs, err := p.lvs()
if err != nil {
@@ -249,7 +257,7 @@ func (p *SKVMGuestLVMPartition) vgActivate(activate bool) bool {
}
func (p *SKVMGuestLVMPartition) vgRename(oldname, newname string) bool {
command := procutils.NewCommand("vgrename", oldname, newname)
command := procutils.NewCommand("vgrename", "--devices", p.partDev, oldname, newname)
output, err := command.Output()
if err != nil {
log.Errorf("unable to exec command: %q, error: %v, output: %q", command, err, output)