github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 19:05:37 +00:00
Code Issues Projects Releases Wiki Activity

infrakit: Make Destroy() usable elsewhere

Browse Source 
Don't return if the process does not exist. Instead proceed and delete
the state directory.

This allows us to use the Destroy() method elsewhere to clean up the state.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-03-01 17:26:44 -08:00
parent 0c1d9fd624
commit 64c0c441ec
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/infrakit.hyperkit/cmd/instance.go
View File

@ -149,12 +149,12 @@ func (v hyperkitPlugin) Destroy(id instance.ID) error {
p, err := getProcess(instanceDir)
if err != nil {
log.Warningln("Can't find processes: ", err)
return err
}
err = p.Kill()
if err != nil {
log.Warningln("Can't kill processes with pid: ", p.Pid, err)
return err
} else {
err = p.Kill()
if err != nil {
log.Warningln("Can't kill processes with pid: ", p.Pid, err)
return err
}
}
if err := os.RemoveAll(instanceDir); err != nil {
@ -205,10 +205,12 @@ func (v hyperkitPlugin) DescribeInstances(tags map[string]string) ([]instance.De
if allMatched {
var logicalID *instance.LogicalID
id := instance.ID(file.Name())
pidData, err := ioutil.ReadFile(path.Join(instanceDir, hyperkitPid))
if err == nil {
id := instance.LogicalID(pidData)
logicalID = &id
lid := instance.LogicalID(pidData)
logicalID = &lid
} else {
if !os.IsNotExist(err) {
return nil, err
@ -217,17 +219,13 @@ func (v hyperkitPlugin) DescribeInstances(tags map[string]string) ([]instance.De
// Check if process is running
if _, err := getProcess(instanceDir); err != nil {
log.Warningln("Process not running: Instance ", file.Name())
if err := os.RemoveAll(instanceDir); err != nil {
log.Warningln("Can't remove instance dir ", instanceDir, " error ", err)
}
log.Warningln("Process not running: Instance ", id)
v.Destroy(id)
continue
}
descriptions = append(descriptions, instance.Description{
ID: instance.ID(file.Name()),
ID: id,
LogicalID: logicalID,
Tags: instanceTags,
})