Merge lp:~joetalbott/qa-dashboard/fix_script_locking into lp:qa-dashboard

[Joe Talbott]

Don't allow update and branch-update scripts to run at the same time.

Don't allow update and branch-update scripts to run at the same time.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:660
http://10.97.0.26:8080/job/dashboard-ci/227/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/227/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

i found it odd the locks were numbered:

  200, 202, 201

But not a big deal.

do we really need to call "scripts/qa-dashboard-update.sh" for a branch-update?

review: Approve

[Joe Talbott (joetalbott)]

On Tue, Oct 22, 2013 at 09:31:49PM -0000, Andy Doan wrote:
> Review: Approve
>
> i found it odd the locks were numbered:
>
> 200, 202, 201
>
> But not a big deal.
>
> do we really need to call "scripts/qa-dashboard-update.sh" for a branch-update?

I was wondering the same thing. If there is consensus I'll remove it
here too.

Though I think the case could happen where an update-branch runs and
blocks an update (which exits) so the update won't run for another hour
which makes a 2 hour gap without new results. But it's not smoke so it
might be okay. Though smoke could take 30 minutes.

Comments?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:661
http://10.97.0.26:8080/job/dashboard-ci/228/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/228/rebuild

review: Approve (continuous-integration)

[Joe Talbott (joetalbott)]

review: Needs Resubmitting

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:662
http://10.97.0.26:8080/job/dashboard-ci/240/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/240/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

+1

review: Approve

[Chris Johnston (cjohnston)]

The attempt to merge lp:~joetalbott/qa-dashboard/fix_script_locking into lp:qa-dashboard failed. Below is the output from the failed tests.

Creating test database for alias 'default'...
Type 'yes' if you would like to try deleting the test database 'test_qa_dashboard', or 'no' to cancel:
Got an error creating the test database: database "test_qa_dashboard" already exists

EOFError: EOF when reading a line

=== modified file 'deployment/apache-mod-wsgi/README'
--- deployment/apache-mod-wsgi/README	2013-10-11 02:58:58 +0000
+++ deployment/apache-mod-wsgi/README	2013-10-28 15:38:02 +0000
@@ -145,7 +145,7 @@
 ###
 
 ##########################  Start  ######################################
-vim $REPO_DIR/scripts/qa-dashboard-update.sh
+vim $REPO_DIR/scripts/qa-dashboard-update-slow.sh
 
 Update the HOME= line to match $REPO_DIR
 ##########################  End  ######################################
@@ -155,5 +155,5 @@
 ###
 {
     crontab -l 2>/dev/null
-	echo '42 * * * * $REPO_DIR/scripts/qa-dashboard-update.sh'
+	echo '42 * * * * $REPO_DIR/scripts/qa-dashboard-update-slow.sh'
 } | crontab -

=== modified file 'scripts/branch-update.sh'
--- scripts/branch-update.sh	2013-10-22 20:25:25 +0000
+++ scripts/branch-update.sh	2013-10-28 15:38:02 +0000
@@ -14,9 +14,9 @@
 
   cd $basedir/..
   (
-    flock 202 # wait for this lock
+    flock 201 # wait for this lock
     (
-      flock 201 # wait for this lock
+      flock 202 # wait for this lock
       if ! bzr missing >/dev/null; then
         bzr pull
         python manage.py syncdb
@@ -26,8 +26,6 @@
       fi
       # update plugins
       python manage.py plugin_sync
-      # run the update script
-    ) 201>/var/lock/$project-qa-dashboard-update
-  ) 202>/var/lock/$project-qa-dashboard-update-15-min
-  scripts/qa-dashboard-update.sh $1
+    ) 202>/var/lock/$project-qa-dashboard-update
+  ) 201>/var/lock/$project-qa-dashboard-update-fast
 ) 200>/var/lock/$project-update-code

=== renamed file 'scripts/qa-dashboard-update-15-min.sh' => 'scripts/qa-dashboard-update-fast.sh'
--- scripts/qa-dashboard-update-15-min.sh	2013-07-24 13:29:43 +0000
+++ scripts/qa-dashboard-update-fast.sh	2013-10-28 15:38:02 +0000
@@ -23,4 +23,4 @@
   # run the update scripts
   python manage.py jenkins_pull_smokeng $DAYS
   python manage.py launchpad_pull_bugs
-) 200>/var/lock/$project-qa-dashboard-update-15-min
+) 200>/var/lock/$project-qa-dashboard-update-fast

=== renamed file 'scripts/qa-dashboard-update.sh' => 'scripts/qa-dashboard-update-slow.sh'