Merge lp:~axwalk/juju-core/local-pkill-qualified-path into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

provider/local: qualify pkill jujud with home dir

When local was changed to use common code for
bootstrap and destroy, destroy regressed and
would destroy any jujud running on the machine.
This CL fixes it by only killing the jujud that
is located in the environment's data-dir.

https://codereview.appspot.com/61820043/

provider/local: qualify pkill jujud with home dir

When local was changed to use common code for
bootstrap and destroy, destroy regressed and
would destroy any jujud running on the machine.
This CL fixes it by only killing the jujud that
is located in the environment's data-dir.

https://codereview.appspot.com/61820043/

[Andrew Wilkins (axwalk)]

Reviewers: mp+205717_code.launchpad.net,

Message:
Please take a look.

Description:
provider/local: qualify pkill jujud with home dir

When local was changed to use common code for
bootstrap and destroy, destroy regressed and
would destroy any jujud running on the machine.
This CL fixes it by only killing the jujud that
is located in the environment's data-dir.

https://code.launchpad.net/~axwalk/juju-core/local-pkill-qualified-path/+merge/205717

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/61820043/

Affected files (+4, -1 lines):
   A [revision details]
   M provider/local/environ.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140211064343-d5yn0b3om93nuecj
+New revision: <email address hidden>

Index: provider/local/environ.go
=== modified file 'provider/local/environ.go'
--- provider/local/environ.go 2014-02-05 08:01:22 +0000
+++ provider/local/environ.go 2014-02-11 09:05:00 +0000
@@ -9,6 +9,7 @@
   "os"
   "os/exec"
   "path/filepath"
+ "regexp"
   "strings"
   "sync"

@@ -434,7 +435,7 @@
    cmd := exec.Command(
     "pkill",
     fmt.Sprintf("-%d", terminationworker.TerminationSignal),
- "jujud",
+ "-f",
filepath.Join(regexp.QuoteMeta(env.config.rootDir()), ".*", "jujud"),
    )
    return cmd.Run()
   }

[Dimiter Naydenov (dimitern)]

LGTM, assuming you tested this with a live environment.

https://codereview.appspot.com/61820043/

[Go Bot (go-bot)]

The attempt to merge lp:~axwalk/juju-core/local-pkill-qualified-path into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.015s
ok launchpad.net/juju-core/agent 0.721s
ok launchpad.net/juju-core/agent/tools 0.253s
ok launchpad.net/juju-core/bzr 6.758s
ok launchpad.net/juju-core/cert 3.312s
ok launchpad.net/juju-core/charm 0.553s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.036s
ok launchpad.net/juju-core/cloudinit/sshinit 1.174s
ok launchpad.net/juju-core/cmd 0.238s
ok launchpad.net/juju-core/cmd/charm-admin 0.816s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 221.724s
ok launchpad.net/juju-core/cmd/jujud 60.325s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 12.731s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/constraints 0.025s
ok launchpad.net/juju-core/container 0.038s
ok launchpad.net/juju-core/container/factory 0.051s
ok launchpad.net/juju-core/container/kvm 0.249s
ok launchpad.net/juju-core/container/kvm/mock 0.056s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 0.275s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.281s
ok launchpad.net/juju-core/environs 3.078s
ok launchpad.net/juju-core/environs/bootstrap 4.413s
ok launchpad.net/juju-core/environs/cloudinit 0.622s
ok launchpad.net/juju-core/environs/config 3.548s
ok launchpad.net/juju-core/environs/configstore 0.038s
ok launchpad.net/juju-core/environs/filestorage 0.032s
ok launchpad.net/juju-core/environs/httpstorage 1.028s
ok launchpad.net/juju-core/environs/imagemetadata 0.573s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.059s
ok launchpad.net/juju-core/environs/jujutest 0.215s
ok launchpad.net/juju-core/environs/manual 9.189s
ok launchpad.net/juju-core/environs/simplestreams 0.340s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.188s
ok launchpad.net/juju-core/environs/storage 1.087s
ok launchpad.net/juju-core/environs/sync 34.159s
ok launchpad.net/juju-core/environs/testing 0.222s
ok launchpad.net/juju-core/environs/tools 6.781s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.015s
ok launchpad.net/juju-core/instance 0.023s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 22.463s
ok launchpad.net/juju-core/juju/osenv 0.027s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.015s
ok launchpad.net/juju-core/log/syslog 0.024s
? launchpad.net/juju-co...

=== modified file 'provider/local/environ.go'
--- provider/local/environ.go	2014-02-05 08:01:22 +0000
+++ provider/local/environ.go	2014-02-11 09:17:50 +0000
@@ -9,6 +9,7 @@
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"sync"
 
@@ -434,7 +435,7 @@
 		cmd := exec.Command(
 			"pkill",
 			fmt.Sprintf("-%d", terminationworker.TerminationSignal),
-			"jujud",
+			"-f", filepath.Join(regexp.QuoteMeta(env.config.rootDir()), ".*", "jujud"),
 		)
 		return cmd.Run()
 	}