juju-core

Merge lp:~axwalk/juju-core/lp1211147-terminate-rsyslog-rule-take2 into lp:~go-bot/juju-core/trunk

  1. lp1211147-terminate-rsyslog-rule-take2
  2. Merge into trunk
Proposed by Andrew Wilkins
Status: Merged
Approved by: Andrew Wilkins
Approved revision: no longer in the source branch.
Merged at revision: 1682
Proposed branch: lp:~axwalk/juju-core/lp1211147-terminate-rsyslog-rule-take2
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 116 lines (+13/-10)
4 files modified
cmd/juju/bootstrap_test.go (+9/-8)
environs/cloudinit/cloudinit_test.go (+2/-2)
log/syslog/config.go (+1/-0)
log/syslog/config_test.go (+1/-0)
To merge this branch: bzr merge lp:~axwalk/juju-core/lp1211147-terminate-rsyslog-rule-take2
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+180761@code.launchpad.net

Commit message

Terminate bootstrap rsyslog rule

I don't fully understand why this fixes the issue, so I was a little
hesitant to propose this, but on the other hand I have tested it and
it does work. I think someone who understands rsyslog well had better
take a look (Ian?)

Fixes bug #1211147

https://codereview.appspot.com/12926045/

Description of the change

Terminate bootstrap rsyslog rule

I don't fully understand why this fixes the issue, so I was a little
hesitant to propose this, but on the other hand I have tested it and
it does work. I think someone who understands rsyslog well had better
take a look (Ian?)

Fixes bug #1211147

https://codereview.appspot.com/12926045/

To post a comment you must log in.
Revision history for this message
Andrew Wilkins (axwalk) wrote :

Reviewers: mp+180761_code.launchpad.net,

Message:
Please take a look.

Description:
Terminate bootstrap rsyslog rule

I don't fully understand why this fixes the issue, so I was a little
hesitant to propose this, but on the other hand I have tested it and
it does work. I think someone who understands rsyslog well had better
take a look (Ian?)

Fixes bug #1211147

https://code.launchpad.net/~axwalk/juju-core/lp1211147-terminate-rsyslog-rule-take2/+merge/180761

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M log/syslog/config.go
   M log/syslog/config_test.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-20130815174953-arsxsn7541v1jxs5
+New revision: <email address hidden>

Index: log/syslog/config.go
=== modified file 'log/syslog/config.go'
--- log/syslog/config.go 2013-07-01 12:15:52 +0000
+++ log/syslog/config.go 2013-08-19 03:03:46 +0000
@@ -34,6 +34,7 @@
  $template JujuLogFormat,"%HOSTNAME%:%msg:2:2048:drop-last-lf%\n"

  :syslogtag, startswith, "juju-"
/var/log/juju/all-machines.log;JujuLogFormat
+& ~
  :syslogtag, startswith, "local-juju-"
/var/log/juju/all-machines.log;JujuLogFormatLocal
  & ~
  `

Index: log/syslog/config_test.go
=== modified file 'log/syslog/config_test.go'
--- log/syslog/config_test.go 2013-07-01 12:15:52 +0000
+++ log/syslog/config_test.go 2013-08-19 03:03:46 +0000
@@ -58,6 +58,7 @@
  $template JujuLogFormat,"%HOSTNAME%:%msg:2:2048:drop-last-lf%\n"

  :syslogtag, startswith, "juju-"
/var/log/juju/all-machines.log;JujuLogFormat
+& ~
  :syslogtag, startswith, "local-juju-"
/var/log/juju/all-machines.log;JujuLogFormatLocal
  & ~
  `

Revision history for this message
John A Meinel (jameinel) wrote :

On 2013/08/19 03:07:09, axw wrote:
> Please take a look.

Ian won't be around today (having surgery). This LGTM, but you can wait
until he's back if you want.

https://codereview.appspot.com/12926045/

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

The attempt to merge lp:~axwalk/juju-core/lp1211147-terminate-rsyslog-rule-take2 into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 1.765s
ok launchpad.net/juju-core/agent/tools 25.832s
ok launchpad.net/juju-core/bzr 6.897s
ok launchpad.net/juju-core/cert 2.432s
ok launchpad.net/juju-core/charm 0.558s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.029s
ok launchpad.net/juju-core/cmd 0.241s
? 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]
FAIL launchpad.net/juju-core/cmd/juju [build failed]
ok launchpad.net/juju-core/cmd/jujud 51.232s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 1.459s
ok launchpad.net/juju-core/constraints 0.047s
ok launchpad.net/juju-core/container/lxc 0.492s
? launchpad.net/juju-core/container/lxc/mock [no test files]
ok launchpad.net/juju-core/downloader 5.243s
ok launchpad.net/juju-core/environs 1.196s

----------------------------------------------------------------------
FAIL: cloudinit_test.go:290: cloudinitSuite.TestCloudInit

test 0
script: set -xe
script: mkdir -p /var/lib/juju
script: mkdir -p /var/log/juju
script: bin='/var/lib/juju/tools/1\.2\.3-precise-amd64'
script: mkdir -p \$bin
script: wget --no-verbose -O - 'http://foo\.com/tools/juju1\.2\.3-precise-amd64\.tgz' \| tar xz -C \$bin
script: echo -n 'http://foo\.com/tools/juju1\.2\.3-precise-amd64\.tgz' > \$bin/downloaded-url\.txt
script: install -m 600 /dev/null '/etc/rsyslog\.d/25-juju\.conf'
script: echo '\\n\$ModLoad imfile\\n\\n\$InputFileStateFile /var/spool/rsyslog/juju-machine-0-state\\n\$InputFilePersistStateInterval 50\\n\$InputFilePollInterval 5\\n\$InputFileName /var/log/juju/machine-0\.log\\n\$InputFileTag local-juju-machine-0:\\n\$InputFileStateFile machine-0\\n\$InputRunFileMonitor\\n\\n\$ModLoad imudp\\n\$UDPServerRun 514\\n\\n# Messages received from remote rsyslog machines contain a leading space so we\\n# need to account for that\.\\n\$template JujuLogFormatLocal,"%HOSTNAME%:%msg:::drop-last-lf%\\n"\\n\$template JujuLogFormat,"%HOSTNAME%:%msg:2:2048:drop-last-lf%\\n"\\n\\n:syslogtag, startswith, "juju-" /var/log/juju/all-machines\.log;JujuLogFormat\\n& ~\\n:syslogtag, startswith, "local-juju-" /var/log/juju/all-machines\.log;JujuLogFormatLocal\\n& ~\\n' > '/etc/rsyslog\.d/25-juju\.conf'
script: restart rsyslog
script: mkdir -p '/var/lib/juju/agents/machine-0'
script: install -m 600 /dev/null '/var/lib/juju/agents/machine-0/agent\.conf'
script: echo 'datadir: /var/lib/juju\\nstateservercert:\\n- 83\\n- 69\\n- 82\\n- 86\\n- 69\\n- 82\\n- 32\\n- 67\\n- 69\\n- 82\\n- 84\\n- 10\\n- 45\\n- 45\\n- 45\\n- 45\\n- 45\\n- 66\\n- 69\\n- 71\\n- 73\\n- 78\\n- 32\\n- 67\\n- 69\\n- 82\\n- 84\\n- 73\\n- 70\\n- 73\\n- 67\\n- 65\\n- 84\\n- 69\\n- 45\\n- 45\\n- 45\\n- 45\\n- 45\\n- 10\\n- 77\\n- 73\\n- 73\\n- 66\\n- 100\\n- 122\\n- 67\\n- 67\\n- 65\\n- 83\\n- 79\\n- 103\\n- 65\\n- 119\\n- 73\\n- 66\\n- 65\\n- 103\\n- 73\\n- 66\\n- 65\\n- 68\\n- 65\\n- 76\\n- 66\\n- 103\\n- 107\\n- 113\\n- 104\\n- 107\\n- 1...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmd/juju/bootstrap_test.go'
2--- cmd/juju/bootstrap_test.go 2013-08-19 13:29:56 +0000
3+++ cmd/juju/bootstrap_test.go 2013-08-20 02:15:14 +0000
4@@ -10,12 +10,13 @@
5
6 gc "launchpad.net/gocheck"
7
8- "launchpad.net/juju-core/agent/tools"
9+ agenttools "launchpad.net/juju-core/agent/tools"
10 "launchpad.net/juju-core/cmd"
11 "launchpad.net/juju-core/constraints"
12 "launchpad.net/juju-core/environs"
13 "launchpad.net/juju-core/environs/sync"
14 envtesting "launchpad.net/juju-core/environs/testing"
15+ "launchpad.net/juju-core/environs/tools"
16 "launchpad.net/juju-core/provider/dummy"
17 coretesting "launchpad.net/juju-core/testing"
18 "launchpad.net/juju-core/version"
19@@ -51,7 +52,7 @@
20
21 func (s *BootstrapSuite) TestTest(c *gc.C) {
22 uploadTools = mockUploadTools
23- defer func() { uploadTools = tools.Upload }()
24+ defer func() { uploadTools = agenttools.Upload }()
25
26 for i, test := range bootstrapTests {
27 c.Logf("\ntest %d: %s", i, test.info)
28@@ -101,7 +102,7 @@
29 for i := 0; i < uploadCount; i++ {
30 c.Check((<-opc).(dummy.OpPutFile).Env, gc.Equals, "peckham")
31 }
32- list, err := environs.FindAvailableTools(env, version.Current.Major)
33+ list, err := tools.FindAvailableTools(env, version.Current.Major)
34 c.Check(err, gc.IsNil)
35 c.Logf("found: " + list.String())
36 urls := list.URLs()
37@@ -254,7 +255,7 @@
38 c.Check(code, gc.Equals, 1)
39
40 // Now check that there are no tools available.
41- _, err := environs.FindAvailableTools(env, version.Current.Major)
42+ _, err := tools.FindAvailableTools(env, version.Current.Major)
43 c.Assert(err, gc.ErrorMatches, "no tools available")
44
45 // Bootstrap the environment with the valid source. This time
46@@ -289,7 +290,7 @@
47 source := c.MkDir()
48 for _, vers := range vAll {
49 data := vers.String()
50- name := tools.StorageName(vers)
51+ name := agenttools.StorageName(vers)
52 filename := filepath.Join(source, name)
53 dir := filepath.Dir(filename)
54 err := os.MkdirAll(dir, 0755)
55@@ -311,12 +312,12 @@
56 }
57
58 // checkTools check if the environment contains the passed tools.
59-func checkTools(c *gc.C, env environs.Environ, tools []version.Binary) {
60- list, err := environs.FindAvailableTools(env, version.Current.Major)
61+func checkTools(c *gc.C, env environs.Environ, expected []version.Binary) {
62+ list, err := tools.FindAvailableTools(env, version.Current.Major)
63 c.Check(err, gc.IsNil)
64 c.Logf("found: " + list.String())
65 urls := list.URLs()
66- c.Check(urls, gc.HasLen, len(tools))
67+ c.Check(urls, gc.HasLen, len(expected))
68 }
69
70 var (
71
72=== modified file 'environs/cloudinit/cloudinit_test.go'
73--- environs/cloudinit/cloudinit_test.go 2013-08-19 11:19:07 +0000
74+++ environs/cloudinit/cloudinit_test.go 2013-08-20 02:15:14 +0000
75@@ -92,7 +92,7 @@
76 wget --no-verbose -O - 'http://foo\.com/tools/juju1\.2\.3-precise-amd64\.tgz' \| tar xz -C \$bin
77 echo -n 'http://foo\.com/tools/juju1\.2\.3-precise-amd64\.tgz' > \$bin/downloaded-url\.txt
78 install -m 600 /dev/null '/etc/rsyslog\.d/25-juju\.conf'
79-echo '\\n\$ModLoad imfile\\n\\n\$InputFileStateFile /var/spool/rsyslog/juju-machine-0-state\\n\$InputFilePersistStateInterval 50\\n\$InputFilePollInterval 5\\n\$InputFileName /var/log/juju/machine-0\.log\\n\$InputFileTag local-juju-machine-0:\\n\$InputFileStateFile machine-0\\n\$InputRunFileMonitor\\n\\n\$ModLoad imudp\\n\$UDPServerRun 514\\n\\n# Messages received from remote rsyslog machines contain a leading space so we\\n# need to account for that.\\n\$template JujuLogFormatLocal,\"%HOSTNAME%:%msg:::drop-last-lf%\\n\"\\n\$template JujuLogFormat,\"%HOSTNAME%:%msg:2:2048:drop-last-lf%\\n\"\\n\\n:syslogtag, startswith, \"juju-\" /var/log/juju/all-machines\.log;JujuLogFormat\\n:syslogtag, startswith, \"local-juju-\" /var/log/juju/all-machines\.log;JujuLogFormatLocal\\n& ~\\n' > '/etc/rsyslog\.d/25-juju\.conf'
80+echo '\\n\$ModLoad imfile\\n\\n\$InputFileStateFile /var/spool/rsyslog/juju-machine-0-state\\n\$InputFilePersistStateInterval 50\\n\$InputFilePollInterval 5\\n\$InputFileName /var/log/juju/machine-0\.log\\n\$InputFileTag local-juju-machine-0:\\n\$InputFileStateFile machine-0\\n\$InputRunFileMonitor\\n\\n\$ModLoad imudp\\n\$UDPServerRun 514\\n\\n# Messages received from remote rsyslog machines contain a leading space so we\\n# need to account for that.\\n\$template JujuLogFormatLocal,\"%HOSTNAME%:%msg:::drop-last-lf%\\n\"\\n\$template JujuLogFormat,\"%HOSTNAME%:%msg:2:2048:drop-last-lf%\\n\"\\n\\n:syslogtag, startswith, \"juju-\" /var/log/juju/all-machines\.log;JujuLogFormat\\n& ~\\n:syslogtag, startswith, \"local-juju-\" /var/log/juju/all-machines\.log;JujuLogFormatLocal\\n& ~\\n' > '/etc/rsyslog\.d/25-juju\.conf'
81 restart rsyslog
82 mkdir -p '/var/lib/juju/agents/machine-0'
83 install -m 600 /dev/null '/var/lib/juju/agents/machine-0/agent\.conf'
84@@ -151,7 +151,7 @@
85 wget --no-verbose -O - 'http://foo\.com/tools/juju1\.2\.3-raring-amd64\.tgz' \| tar xz -C \$bin
86 echo -n 'http://foo\.com/tools/juju1\.2\.3-raring-amd64\.tgz' > \$bin/downloaded-url\.txt
87 install -m 600 /dev/null '/etc/rsyslog\.d/25-juju\.conf'
88-echo '\\n\$ModLoad imfile\\n\\n\$InputFileStateFile /var/spool/rsyslog/juju-machine-0-state\\n\$InputFilePersistStateInterval 50\\n\$InputFilePollInterval 5\\n\$InputFileName /var/log/juju/machine-0.log\\n\$InputFileTag local-juju-machine-0:\\n\$InputFileStateFile machine-0\\n\$InputRunFileMonitor\\n\\n\$ModLoad imudp\\n\$UDPServerRun 514\\n\\n# Messages received from remote rsyslog machines contain a leading space so we\\n# need to account for that.\\n\$template JujuLogFormatLocal,\"%HOSTNAME%:%msg:::drop-last-lf%\\n\"\\n\$template JujuLogFormat,\"%HOSTNAME%:%msg:2:2048:drop-last-lf%\\n\"\\n\\n:syslogtag, startswith, \"juju-\" /var/log/juju/all-machines.log;JujuLogFormat\\n:syslogtag, startswith, \"local-juju-\" /var/log/juju/all-machines.log;JujuLogFormatLocal\\n& ~\\n' > '/etc/rsyslog\.d/25-juju\.conf'
89+echo '\\n\$ModLoad imfile\\n\\n\$InputFileStateFile /var/spool/rsyslog/juju-machine-0-state\\n\$InputFilePersistStateInterval 50\\n\$InputFilePollInterval 5\\n\$InputFileName /var/log/juju/machine-0.log\\n\$InputFileTag local-juju-machine-0:\\n\$InputFileStateFile machine-0\\n\$InputRunFileMonitor\\n\\n\$ModLoad imudp\\n\$UDPServerRun 514\\n\\n# Messages received from remote rsyslog machines contain a leading space so we\\n# need to account for that.\\n\$template JujuLogFormatLocal,\"%HOSTNAME%:%msg:::drop-last-lf%\\n\"\\n\$template JujuLogFormat,\"%HOSTNAME%:%msg:2:2048:drop-last-lf%\\n\"\\n\\n:syslogtag, startswith, \"juju-\" /var/log/juju/all-machines.log;JujuLogFormat\\n& ~\\n:syslogtag, startswith, \"local-juju-\" /var/log/juju/all-machines.log;JujuLogFormatLocal\\n& ~\\n' > '/etc/rsyslog\.d/25-juju\.conf'
90 restart rsyslog
91 mkdir -p '/var/lib/juju/agents/machine-0'
92 install -m 600 /dev/null '/var/lib/juju/agents/machine-0/agent\.conf'
93
94=== modified file 'log/syslog/config.go'
95--- log/syslog/config.go 2013-07-01 12:15:52 +0000
96+++ log/syslog/config.go 2013-08-20 02:15:14 +0000
97@@ -34,6 +34,7 @@
98 $template JujuLogFormat,"%HOSTNAME%:%msg:2:2048:drop-last-lf%\n"
99
100 :syslogtag, startswith, "juju-" /var/log/juju/all-machines.log;JujuLogFormat
101+& ~
102 :syslogtag, startswith, "local-juju-" /var/log/juju/all-machines.log;JujuLogFormatLocal
103 & ~
104 `
105
106=== modified file 'log/syslog/config_test.go'
107--- log/syslog/config_test.go 2013-08-19 11:19:07 +0000
108+++ log/syslog/config_test.go 2013-08-20 02:15:14 +0000
109@@ -58,6 +58,7 @@
110 $template JujuLogFormat,"%HOSTNAME%:%msg:2:2048:drop-last-lf%\n"
111
112 :syslogtag, startswith, "juju-" /var/log/juju/all-machines.log;JujuLogFormat
113+& ~
114 :syslogtag, startswith, "local-juju-" /var/log/juju/all-machines.log;JujuLogFormatLocal
115 & ~
116 `

Subscribers

People subscribed via source and target branches

to status/vote changes: