Yedidyah Bar David has uploaded a new change for review.
Change subject: packaging: do not use /var/tmp for engine
......................................................................
packaging: do not use /var/tmp for engine
/var/tmp is intended for temporary files.
The engine is a long-running process, and should not keep its files
there. Use /var/lib/ovirt-engine/jboss_runtime instead.
Change-Id: I88563c8c0d319eb3356b47233a31c82d9e8b84c7
Signed-off-by: Yedidyah Bar David <d...@redhat.com>
(cherry picked from commit 7ef24407897ba97e6eb9a41fe0b05fd1cfc9d208)
---
M Makefile
M packaging/services/ovirt-engine/ovirt-engine.conf.in
M packaging/services/ovirt-engine/ovirt-engine.py
M packaging/services/ovirt-engine/ovirt-engine.xml.in
4 files changed, 15 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/29754/1
diff --git a/Makefile b/Makefile
index 9d92585..2442232 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,7 @@
PKG_STATE_DIR=$(LOCALSTATE_DIR)/lib/$(ENGINE_NAME)
PKG_TMP_DIR=$(LOCALSTATE_DIR)/tmp/$(ENGINE_NAME)
JBOSS_HOME=/usr/share/jboss-as
+JBOSS_RUNTIME=$(PKG_STATE_DIR)/jboss_runtime
PYTHON_DIR=$(PYTHON_SYS_DIR)
DEV_PYTHON_DIR=
PKG_USER=ovirt
@@ -159,6 +160,7 @@
-e "s|@PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
-e "s|@DISPLAY_VERSION@|$(DISPLAY_VERSION)|g" \
-e "s|@JBOSS_HOME@|$(JBOSS_HOME)|g" \
+ -e "s|@JBOSS_RUNTIME@|$(JBOSS_RUNTIME)|g" \
-e "s|@PEP8@|$(PEP8)|g" \
-e "s|@PYFLAKES@|$(PYFLAKES)|g" \
-e "s|@DEVMODE@|$(BUILD_DEV)|g" \
diff --git a/packaging/services/ovirt-engine/ovirt-engine.conf.in
b/packaging/services/ovirt-engine/ovirt-engine.conf.in
index e7b8579..ac58fe9 100644
--- a/packaging/services/ovirt-engine/ovirt-engine.conf.in
+++ b/packaging/services/ovirt-engine/ovirt-engine.conf.in
@@ -16,6 +16,7 @@
# The location of the application server used by the engine:
#
JBOSS_HOME="@JBOSS_HOME@"
+JBOSS_RUNTIME="@JBOSS_RUNTIME@"
#
# Important directories used by the engine:
diff --git a/packaging/services/ovirt-engine/ovirt-engine.py
b/packaging/services/ovirt-engine/ovirt-engine.py
index 9ff2769..3735388 100755
--- a/packaging/services/ovirt-engine/ovirt-engine.py
+++ b/packaging/services/ovirt-engine/ovirt-engine.py
@@ -39,6 +39,7 @@
def __init__(self):
super(Daemon, self).__init__()
self._tempDir = None
+ self._jbossRuntime = None
self._defaults = os.path.abspath(
os.path.join(
os.path.dirname(sys.argv[0]),
@@ -61,7 +62,7 @@
searchList=[
self._config,
{
- 'tempdir': self._tempDir.directory,
+ 'jboss_runtime': self._jbossRuntime.directory,
},
],
)
@@ -172,7 +173,7 @@
def _setupEngineApps(self):
deploymentsDir = os.path.join(
- self._tempDir.directory,
+ self._jbossRuntime.directory,
'deployments',
)
os.mkdir(deploymentsDir)
@@ -250,21 +251,24 @@
self._tempDir = service.TempDir(self._config.get('ENGINE_TMP'))
self._tempDir.create()
+ self._jbossRuntime = service.TempDir(self._config.get('JBOSS_RUNTIME'))
+ self._jbossRuntime.create()
+
self._setupEngineApps()
jbossTempDir = os.path.join(
- self._tempDir.directory,
+ self._jbossRuntime.directory,
'tmp',
)
jbossConfigDir = os.path.join(
- self._tempDir.directory,
+ self._jbossRuntime.directory,
'config',
)
javaModulePath = self._linkModules(
os.path.join(
- self._tempDir.directory,
+ self._jbossRuntime.directory,
'modules',
),
'%s:%s' % (
@@ -439,6 +443,8 @@
def daemonCleanup(self):
if self._tempDir:
self._tempDir.destroy()
+ if self._jbossRuntime:
+ self._jbossRuntime.destroy()
if __name__ == '__main__':
diff --git a/packaging/services/ovirt-engine/ovirt-engine.xml.in
b/packaging/services/ovirt-engine/ovirt-engine.xml.in
index ac772e3..6ec2dbe 100644
--- a/packaging/services/ovirt-engine/ovirt-engine.xml.in
+++ b/packaging/services/ovirt-engine/ovirt-engine.xml.in
@@ -174,7 +174,7 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
- <deployment-scanner scan-interval="5000" path="$tempdir/deployments"
deployment-timeout="1200"/>
+ <deployment-scanner scan-interval="5000"
path="$jboss_runtime/deployments" deployment-timeout="1200"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ee:1.0"/>
--
To view, visit http://gerrit.ovirt.org/29754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88563c8c0d319eb3356b47233a31c82d9e8b84c7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Yedidyah Bar David <d...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
