juju-core

Merge lp:~thumper/juju-core/system-upstart into lp:~go-bot/juju-core/trunk

  1. system-upstart
  2. Merge into trunk
Proposed by Tim Penhey
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 1907
Proposed branch: lp:~thumper/juju-core/system-upstart
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 35 lines (+5/-2)
2 files modified
upstart/upstart.go (+2/-2)
upstart/upstart_test.go (+3/-0)
To merge this branch: bzr merge lp:~thumper/juju-core/system-upstart
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+188247@code.launchpad.net

Commit message

Explicitly specify the system bus for upstart.

With newer upstarts, calling 'sudo -E' to start the
local provider caused juju to not find the correct
upstart script to start.

https://codereview.appspot.com/14114043/

Description of the change

Explicitly specify the system bus for upstart.

With newer upstarts, calling 'sudo -E' to start the
local provider caused juju to not find the correct
upstart script to start.

https://codereview.appspot.com/14114043/

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

Reviewers: mp+188247_code.launchpad.net,

Message:
Please take a look.

Description:
Explicitly specify the system bus for upstart.

With newer upstarts, calling 'sudo -E' to start the
local provider caused juju to not find the correct
upstart script to start.

https://code.launchpad.net/~thumper/juju-core/system-upstart/+merge/188247

(do not edit description out of merge proposal)

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

Affected files (+4, -2 lines):
   A [revision details]
   M upstart/upstart.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-20130927195254-bamcrcscoqtu0wle
+New revision: <email address hidden>

Index: upstart/upstart.go
=== modified file 'upstart/upstart.go'
--- upstart/upstart.go 2013-08-29 03:58:19 +0000
+++ upstart/upstart.go 2013-09-29 23:03:55 +0000
@@ -54,7 +54,7 @@
   if s.Running() {
    return nil
   }
- return runCommand("start", s.Name)
+ return runCommand("start", "--system", s.Name)
  }

  func runCommand(args ...string) error {
@@ -74,7 +74,7 @@
   if !s.Running() {
    return nil
   }
- return runCommand("stop", s.Name)
+ return runCommand("stop", "--system", s.Name)
  }

  // StopAndRemove stops the service and then deletes the service

Revision history for this message
Tim Penhey (thumper) wrote :

Please take a look.

https://codereview.appspot.com/14114043/

Revision history for this message
Dave Cheney (dave-cheney) wrote :

LGTM. Fingers crossed it works on precise.

On Mon, Sep 30, 2013 at 9:21 AM, Tim Penhey <email address hidden> wrote:
> Please take a look.
>
> https://codereview.appspot.com/14114043/
>
> --
> https://code.launchpad.net/~thumper/juju-core/system-upstart/+merge/188247
> You are subscribed to branch lp:juju-core.

Revision history for this message
Go Bot (go-bot) wrote :
Download full text (33.3 KiB)

The attempt to merge lp:~thumper/juju-core/system-upstart into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 0.722s
ok launchpad.net/juju-core/agent/tools 0.284s
ok launchpad.net/juju-core/bzr 7.120s
ok launchpad.net/juju-core/cert 3.018s
ok launchpad.net/juju-core/charm 0.579s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.025s
ok launchpad.net/juju-core/cmd 0.245s
? launchpad.net/juju-core/cmd/builddb [no test files]
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
listing available tools
found 8 tools
found 8 recent tools (version 1.15.0)
listing target bucket
found 0 tools in target; 8 tools to be copied
copying 1.15.0-precise-amd64 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-precise-amd64.tgz
copying tools/releases/juju-1.15.0-precise-amd64.tgz
downloaded tools/releases/juju-1.15.0-precise-amd64.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-precise-i386 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-precise-i386.tgz
copying tools/releases/juju-1.15.0-precise-i386.tgz
downloaded tools/releases/juju-1.15.0-precise-i386.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-quantal-amd64 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-quantal-amd64.tgz
copying tools/releases/juju-1.15.0-quantal-amd64.tgz
downloaded tools/releases/juju-1.15.0-quantal-amd64.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-quantal-i386 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-quantal-i386.tgz
copying tools/releases/juju-1.15.0-quantal-i386.tgz
downloaded tools/releases/juju-1.15.0-quantal-i386.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-raring-amd64 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-raring-amd64.tgz
copying tools/releases/juju-1.15.0-raring-amd64.tgz
downloaded tools/releases/juju-1.15.0-raring-amd64.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-raring-i386 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-raring-i386.tgz
copying tools/releases/juju-1.15.0-raring-i386.tgz
downloaded tools/releases/juju-1.15.0-raring-i386.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-saucy-amd64 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-saucy-amd64.tgz
copying tools/releases/juju-1.15.0-saucy-amd64.tgz
downloaded tools/releases/juju-1.15.0-saucy-amd64.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-saucy-i386 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-saucy-i386.tgz
copying tools/releases/juju-1.15.0-saucy-i386.tgz
downloaded tools/releases/juju-1.15.0-saucy-i386.tgz (0kB), uploading
download 0kB, uploading
copied 8 tools
generating tools metadata
tools metadata written

Juju cannot bootstrap because no tools are available for your environment.
In addition, no tools could be located to upload.
You may want to use the 'tools-url' configuration setting to specify the tools location.

listing available tools
found 8 tools
found 8 re...

Revision history for this message
Go Bot (go-bot) wrote :
Download full text (33.4 KiB)

The attempt to merge lp:~thumper/juju-core/system-upstart into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 0.773s
ok launchpad.net/juju-core/agent/tools 0.287s
ok launchpad.net/juju-core/bzr 6.398s
ok launchpad.net/juju-core/cert 3.473s
ok launchpad.net/juju-core/charm 0.512s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.025s
ok launchpad.net/juju-core/cmd 0.218s
? launchpad.net/juju-core/cmd/builddb [no test files]
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
listing available tools
found 8 tools
found 8 recent tools (version 1.15.0)
listing target bucket
found 0 tools in target; 8 tools to be copied
copying 1.15.0-precise-amd64 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-precise-amd64.tgz
copying tools/releases/juju-1.15.0-precise-amd64.tgz
downloaded tools/releases/juju-1.15.0-precise-amd64.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-precise-i386 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-precise-i386.tgz
copying tools/releases/juju-1.15.0-precise-i386.tgz
downloaded tools/releases/juju-1.15.0-precise-i386.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-quantal-amd64 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-quantal-amd64.tgz
copying tools/releases/juju-1.15.0-quantal-amd64.tgz
downloaded tools/releases/juju-1.15.0-quantal-amd64.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-quantal-i386 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-quantal-i386.tgz
copying tools/releases/juju-1.15.0-quantal-i386.tgz
downloaded tools/releases/juju-1.15.0-quantal-i386.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-raring-amd64 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-raring-amd64.tgz
copying tools/releases/juju-1.15.0-raring-amd64.tgz
downloaded tools/releases/juju-1.15.0-raring-amd64.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-raring-i386 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-raring-i386.tgz
copying tools/releases/juju-1.15.0-raring-i386.tgz
downloaded tools/releases/juju-1.15.0-raring-i386.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-saucy-amd64 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-saucy-amd64.tgz
copying tools/releases/juju-1.15.0-saucy-amd64.tgz
downloaded tools/releases/juju-1.15.0-saucy-amd64.tgz (0kB), uploading
download 0kB, uploading
copying 1.15.0-saucy-i386 from https://juju-dist.s3.amazonaws.com/tools/releases/juju-1.15.0-saucy-i386.tgz
copying tools/releases/juju-1.15.0-saucy-i386.tgz
downloaded tools/releases/juju-1.15.0-saucy-i386.tgz (0kB), uploading
download 0kB, uploading
copied 8 tools
generating tools metadata
tools metadata written

Juju cannot bootstrap because no tools are available for your environment.
In addition, no tools could be located to upload.
You may want to use the 'tools-url' configuration setting to specify the tools location.

listing available tools
found 8 tools
found 8 re...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'upstart/upstart.go'
2--- upstart/upstart.go 2013-08-29 03:58:19 +0000
3+++ upstart/upstart.go 2013-09-29 23:12:44 +0000
4@@ -54,7 +54,7 @@
5 if s.Running() {
6 return nil
7 }
8- return runCommand("start", s.Name)
9+ return runCommand("start", "--system", s.Name)
10 }
11
12 func runCommand(args ...string) error {
13@@ -74,7 +74,7 @@
14 if !s.Running() {
15 return nil
16 }
17- return runCommand("stop", s.Name)
18+ return runCommand("stop", "--system", s.Name)
19 }
20
21 // StopAndRemove stops the service and then deletes the service
22
23=== modified file 'upstart/upstart_test.go'
24--- upstart/upstart_test.go 2013-08-29 03:58:19 +0000
25+++ upstart/upstart_test.go 2013-09-29 23:12:44 +0000
26@@ -41,6 +41,9 @@
27
28 var checkargs = `
29 #!/bin/bash
30+if [ "$1" == "--system" ]; then
31+ shift
32+fi
33 if [ "$1" != "some-service" ]; then
34 exit 255
35 fi

Subscribers

People subscribed via source and target branches

to status/vote changes: