From 1160068ce4822e919b7adca62852b76ec0b7e14a Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 16 Aug 2012 09:09:00 -0700 Subject: [PATCH] Use timeout(1) to timeout and kill gerrit hooks. If a gerrit hook blocks none of the other hooks queued behind it run. Give each hook subprocess 10 minutes to run otherwise timeout and kill that process. Change-Id: Ic5e1243e08088dbf0c5bff49e7fc05bcb867819b Reviewed-on: https://review.openstack.org/11475 Reviewed-by: James E. Blair Approved: James E. Blair Tested-by: Jenkins --- modules/openstack_project/files/gerrit/change-merged | 3 ++- modules/openstack_project/files/gerrit/patchset-created | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/files/gerrit/change-merged b/modules/openstack_project/files/gerrit/change-merged index 7516919104..ef0cd3a296 100755 --- a/modules/openstack_project/files/gerrit/change-merged +++ b/modules/openstack_project/files/gerrit/change-merged @@ -1,3 +1,4 @@ #!/bin/sh -python /usr/local/gerrit/scripts/update_bug.py change-merged "$@" +# Use timeout to kill any process running longer than 10 minutes. +timeout -k 2m 10m python /usr/local/gerrit/scripts/update_bug.py change-merged "$@" diff --git a/modules/openstack_project/files/gerrit/patchset-created b/modules/openstack_project/files/gerrit/patchset-created index 4a582bd7ef..57eabcd94b 100755 --- a/modules/openstack_project/files/gerrit/patchset-created +++ b/modules/openstack_project/files/gerrit/patchset-created @@ -1,5 +1,6 @@ #!/bin/sh -python /usr/local/gerrit/scripts/update_blueprint.py patchset-created "$@" -python /usr/local/gerrit/scripts/update_bug.py patchset-created "$@" -python /usr/local/gerrit/scripts/notify_doc_impact.py patchset-created "$@" +# Use timeout to kill any process running longer than 10 minutes. +timeout -k 2m 10m python /usr/local/gerrit/scripts/update_blueprint.py patchset-created "$@" +timeout -k 2m 10m python /usr/local/gerrit/scripts/update_bug.py patchset-created "$@" +timeout -k 2m 10m python /usr/local/gerrit/scripts/notify_doc_impact.py patchset-created "$@"