Launchpad itself

Merge ~pelpsi/launchpad:process-death-row-lockfile-in-use into launchpad:master

  1. Git
  2. lp:~pelpsi/launchpad
  3. process-death-row-lockfile-in-use
  4. Merge into master
Proposed by Simone Pelosi
Status: Merged
Approved by: Simone Pelosi
Approved revision: 0fcaa8cbd558f9c297bdd926d71af3366ce4e823
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pelpsi/launchpad:process-death-row-lockfile-in-use
Merge into: launchpad:master
Diff against target: 13 lines (+1/-1)
1 file modified
charm/launchpad-ppa-publisher/templates/crontab.j2 (+1/-1)
Reviewer Review Type Date Requested Status
Ines Almeida Approve
Review via email: mp+457626@code.launchpad.net

Commit message

Lockfile in use by process-death-row-py `--all-derived`

We are calling `process-death-row.py --all-derived` every hour and
it shares the lockfile with `process-death-row.py -d ubuntu` that is
called every 6 hours. Thus it may happen that one of the two processes
finds the lockfile already in use.

To post a comment you must log in.
Revision history for this message
Ines Almeida (ines-almeida) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-ppa-publisher/templates/crontab.j2 b/charm/launchpad-ppa-publisher/templates/crontab.j2
2index d9ae397..f4918ed 100644
3--- a/charm/launchpad-ppa-publisher/templates/crontab.j2
4+++ b/charm/launchpad-ppa-publisher/templates/crontab.j2
5@@ -14,7 +14,7 @@ P3AROOT={{ ppa_archive_private_root }}
6 17,47 * * * * nice -n 15 {{ code_dir }}/cronscripts/parse-ppa-apache-access-logs.py -q --log-file=INFO:{{ logs_dir }}/parse-ppa-apache-access-logs.log
7
8 59 05 * * 0 {{ code_dir }}/cronscripts/publishing/cron.daily-ppa >> {{ logs_dir }}/cron.ppa.log 2>&1
9-0 */6 * * * nice -n 17 {{ code_dir }}/scripts/process-death-row.py -d ubuntu --ppa -q --log-file=INFO:{{ logs_dir }}/process-death-row.log
10+1 */6 * * * nice -n 17 {{ code_dir }}/scripts/process-death-row.py -d ubuntu --ppa -q --log-file=INFO:{{ logs_dir }}/process-death-row.log
11 0 * * * * nice -n 17 {{ code_dir }}/scripts/process-death-row.py --all-derived --ppa -q --log-file=INFO:{{ logs_dir }}/derived-process-death-row.log
12 */20 * * * * nice -n 12 ionice -c 2 -n 7 {{ code_dir }}/cronscripts/ppa-generate-keys.py -q --log-file=INFO:{{ logs_dir }}/ppa-generate-keys.log
13 {% endif %}

Subscribers

People subscribed via source and target branches

to status/vote changes: