Merge lp:~mthaddon/launchpad/buildjob-nagios-check-perms into lp:launchpad/db-devel

[Tom Haddon]

[Tom Haddon (mthaddon)]

Permissions needed by a nagios check for whether there are build jobs that have started but don't have a builder assigned - obsolete once bug 499421 is fixed

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Tom Haddon wrote:
> Tom Haddon has proposed merging lp:~mthaddon/launchpad/buildjob-nagios-check-perms into lp:launchpad.
>
> Requested reviews:
> Canonical Launchpad Engineering (launchpad)
>
>
> Permissions needed by a nagios check for whether there are build jobs that have started but don't have a builder assigned - obsolete once bug 499421 is fixed
>
>

I need to ask some questions because this isn't in our standard format
for review requests:

1. Was there a pre-implementation call?
2. Did you run "make lint", and was the output clean?

> === modified file 'cronscripts/librarian-gc.py'
> --- cronscripts/librarian-gc.py 2009-11-25 08:53:00 +0000
> +++ cronscripts/librarian-gc.py 2009-12-23 11:42:26 +0000
> @@ -51,6 +51,12 @@
> help="Skip removing files on disk with no database references"
> " or flagged for deletion."
> )
> + self.parser.add_option(
> + '', "--skip-expiry", action="store_true", default=False,
> + dest="skip_expiry",
> + help="Skip expiring aliases with an expiry date in the past."
> + )

How does this relate to the permissions issue?

> +
>
> def main(self):
> librariangc.log = self.logger
> @@ -66,6 +72,8 @@
>
> # Note that each of these next steps will issue commit commands
> # as appropriate to make this script transaction friendly
> + if not self.options.skip_expiry:
> + librariangc.expire_aliases(conn)
> if not self.options.skip_content:
> librariangc.delete_unreferenced_content(conn) # first sweep
> if not self.options.skip_blobs:
>
> === modified file 'database/schema/security.cfg'
> --- database/schema/security.cfg 2009-12-22 09:37:00 +0000
> +++ database/schema/security.cfg 2009-12-23 11:42:26 +0000
> @@ -1838,6 +1838,11 @@
>
> [nagios]
> type=user
> +public.archive = SELECT
> +public.build = SELECT
> +public.buildqueue = SELECT
> +public.buildpackagejob = SELECT
> +public.job = SELECT
> public.libraryfilecontent = SELECT
> public.openidrpconfig = SELECT
> public.branch = SELECT
>
> === modified file 'lib/canonical/librarian/ftests/test_gc.py'
> --- lib/canonical/librarian/ftests/test_gc.py 2009-11-25 08:53:00 +0000
> +++ lib/canonical/librarian/ftests/test_gc.py 2009-12-23 11:42:26 +0000
> @@ -55,6 +55,22 @@
> self.client = LibrarianClient()
> librariangc.log = MockLogger()
>
> + # A value we use in a number of tests. This represents the
> + # stay of execution hard coded into the garbage collector.
> + # We don't destroy any data unless it has been waiting to be
> + # destroyed for longer than this period. We pick a value
> + # that is close enough to the stay of execution so that
> + # forgetting timezone information will break things, but
> + # far enough so that how long it takes the test to...

[Aaron Bentley (abentley)]

review: Needs Information

[Tom Haddon (mthaddon)]

I think this was a case of operator error - I branched off devel and so I think it shows a bunch of irrelevant changes - have fixed to branch off db-devel and re-pushed. The only change should be to database/schema/security.cfg

Thanks, Tom

[Aaron Bentley (abentley)]

> I think this was a case of operator error - I branched off devel and so I
> think it shows a bunch of irrelevant changes - have fixed to branch off db-
> devel and re-pushed. The only change should be to database/schema/security.cfg

Ah, much better.

Aaron

review: Approve

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2009-12-22 09:37:00 +0000
+++ database/schema/security.cfg	2010-01-04 16:01:15 +0000
@@ -1838,6 +1838,11 @@
 
 [nagios]
 type=user
+public.archive                          = SELECT
+public.build                            = SELECT
+public.buildqueue                       = SELECT
+public.buildpackagejob                  = SELECT
+public.job                              = SELECT
 public.libraryfilecontent               = SELECT
 public.openidrpconfig                   = SELECT
 public.branch                           = SELECT