Simone Tiraboschi has uploaded a new change for review.
Change subject: Revert "packaging: setup: avoid setting
AsyncTaskZombieTaskLifeInMinutes to 0"
......................................................................
Revert "packaging: setup: avoid setting AsyncTaskZombieTaskLifeInMinutes to 0"
This reverts commit 418b44f3be572d3d64f22436e9e5a28348bfde2b.
Change-Id: I07b4ea0f239b71f1af4bfbd828e579e1bdd5e0a0
Signed-off-by: Simone Tiraboschi <stira...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py
1 file changed, 27 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/38893/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 365cc21..477e0f3 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
@@ -30,6 +30,7 @@
from ovirt_engine_setup import constants as osetupcons
from ovirt_engine_setup import dialog
from ovirt_engine_setup.engine import constants as oenginecons
+from ovirt_engine_setup.engine import vdcoption
from ovirt_engine_setup.engine_common import constants as oengcommcons
from ovirt_engine_setup.engine_common import database
@@ -53,7 +54,15 @@
self._origTimeout = 0
self._dbstatement = dbstatement
- def _setEngineMode(self, maintenance):
+ def _getCurrentTimeout(self):
+ return vdcoption.VdcOption(
+ statement=self._dbstatement,
+ ).getVdcOption(
+ name='AsyncTaskZombieTaskLifeInMinutes',
+ ownConnection=True,
+ )
+
+ def _setEngineMode(self, maintenance, timeout=0):
mode = (
'MAINTENANCE' if maintenance
else 'ACTIVE'
@@ -65,6 +74,21 @@
)
)
+ 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',
@@ -83,6 +107,7 @@
)
def __enter__(self):
+ self._origTimeout = self._getCurrentTimeout()
self._setEngineMode(
maintenance=True,
)
@@ -99,6 +124,7 @@
)
self._setEngineMode(
maintenance=False,
+ timeout=self._origTimeout,
)
def _clearZombies(self):
--
To view, visit https://gerrit.ovirt.org/38893
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07b4ea0f239b71f1af4bfbd828e579e1bdd5e0a0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
