Simone Tiraboschi has uploaded a new change for review. Change subject: packaging: setup: avoid setting AsyncTaskZombieTaskLifeInMinutes to 0 ......................................................................
packaging: setup: avoid setting AsyncTaskZombieTaskLifeInMinutes to 0 Avoid setting AsyncTaskZombieTaskLifeInMinutes to 0 otherwise every task is always considered a zombie. Change-Id: Ia7bdf24831e8974daa5fd6735c1402a8cb12b6ea Bug-Url: https://bugzilla.redhat.com/1161012 Signed-off-by: Simone Tiraboschi <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py 1 file changed, 1 insertion(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/38602/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py index f1f371a..d44a667 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py @@ -36,7 +36,6 @@ from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup.engine_common import database -from ovirt_engine_setup.engine import vdcoption from async_tasks_map import ASYNC_TASKS_MAP @@ -57,15 +56,7 @@ self._origTimeout = 0 self._dbstatement = dbstatement - def _getCurrentTimeout(self): - return vdcoption.VdcOption( - statement=self._dbstatement, - ).getVdcOption( - name='AsyncTaskZombieTaskLifeInMinutes', - ownConnection=True, - ) - - def _setEngineMode(self, maintenance, timeout=0): + def _setEngineMode(self, maintenance): mode = ( 'MAINTENANCE' if maintenance else 'ACTIVE' @@ -77,21 +68,6 @@ ) ) - vdcoption.VdcOption( - statement=self._dbstatement, - ).updateVdcOptions( - options=( - { - 'name': 'EngineMode', - 'value': mode, - }, - { - 'name': 'AsyncTaskZombieTaskLifeInMinutes', - 'value': timeout, - }, - ), - ownConnection=True, - ) except Exception as e: self._parent.logger.debug( 'Cannot set engine mode', @@ -110,7 +86,6 @@ ) def __enter__(self): - self._origTimeout = self._getCurrentTimeout() self._setEngineMode( maintenance=True, ) @@ -127,7 +102,6 @@ ) self._setEngineMode( maintenance=False, - timeout=self._origTimeout, ) def _clearZombies(self): -- To view, visit https://gerrit.ovirt.org/38602 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7bdf24831e8974daa5fd6735c1402a8cb12b6ea Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
