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

Kill processes in time & Add debug info

Browse Source
This commit is contained in:
rainzm
2020-05-21 10:45:43 +08:00
parent dae02ec019
commit ff2fc74401
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/diskutils/vddk.go
+9 -3
View File
@@ -116,8 +116,8 @@ func (c *Command) Wait() error {
return <-c.done
}
func (c *Command) Kill() {
c.Process.Kill()
func (c *Command) Kill() error {
return c.Process.Kill()
}
func execpath() string {
@@ -155,7 +155,12 @@ func (vd *VDDKDisk) MountRootfs() fsdriver.IRootFsDriver {
log.Errorf("VDDKDisk Mount failed: %s", err)
}
// something is wrong
vd.UmountRootfs(nil)
if vd.Proc != nil {
err := vd.Proc.Kill()
if err != nil {
log.Errorf("unable to kill proc: %s", err.Error())
}
}
return nil
}
@@ -337,6 +342,7 @@ Loop:
}
backup := vd.Proc.stdouterr.String()
log.Debugf(backup)
err := vd.ParsePartitions(backup)
if err != nil {
return errors.Wrap(err, "VDDKDisk.ParsePartitions")