Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: remove unused lock directory ......................................................................
packaging: remove unused lock directory Change-Id: I8610a41c64d069a283e6ff3a04fa2cf827dd5540 Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile M backend/manager/conf/engine.conf.defaults.in M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java M packaging/fedora/engine-service.py.in M packaging/fedora/spec/ovirt-engine.spec.in 5 files changed, 0 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/13314/1 diff --git a/Makefile b/Makefile index 174986c..bf844cd 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,6 @@ PKG_EAR_DIR=$(DATA_DIR)/engine.ear PKG_JBOSS_MODULES=$(DATA_DIR)/modules PKG_CACHE_DIR=$(LOCALSTATE_DIR)/cache/$(ENGINE_NAME) -PKG_LOCK_DIR=$(LOCALSTATE_DIR)/lock/$(ENGINE_NAME) PKG_LOG_DIR=$(LOCALSTATE_DIR)/log/$(ENGINE_NAME) PKG_TMP_DIR=$(LOCALSTATE_DIR)/tmp/$(ENGINE_NAME) RPMBUILD=rpmbuild @@ -105,7 +104,6 @@ -e "s|@ENGINE_TMP@|$(PKG_TMP_DIR)|" \ -e "s|@ENGINE_USR@|$(DATA_DIR)|" \ -e "s|@ENGINE_VAR@|$(ENGINE_STATE)|" \ - -e "s|@ENGINE_LOCK@|$(PKG_LOCK_DIR)|" \ -e "s|@ENGINE_CACHE@|$(PKG_CACHE_DIR)|" \ -e "s|@ENGINE_PID@|$(PID_DIR)/$(ENGINE_NAME).pid|" \ -e "s|@RPM_VERSION@|$(RPM_VERSION)|" \ diff --git a/backend/manager/conf/engine.conf.defaults.in b/backend/manager/conf/engine.conf.defaults.in index 888c655..592f359 100644 --- a/backend/manager/conf/engine.conf.defaults.in +++ b/backend/manager/conf/engine.conf.defaults.in @@ -25,7 +25,6 @@ ENGINE_TMP=@ENGINE_TMP@ ENGINE_USR=@ENGINE_USR@ ENGINE_VAR=@ENGINE_VAR@ -ENGINE_LOCK=@ENGINE_LOCK@ ENGINE_CACHE=@ENGINE_CACHE@ # diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java index fe72236..2c366b0 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java @@ -364,10 +364,6 @@ return getFile("ENGINE_VAR"); } - public File getLockDir() { - return getFile("ENGINE_LOCK"); - } - public File getCacheDir() { return getFile("ENGINE_CACHE"); } diff --git a/packaging/fedora/engine-service.py.in b/packaging/fedora/engine-service.py.in index e3663a8..7a992bb 100644 --- a/packaging/fedora/engine-service.py.in +++ b/packaging/fedora/engine-service.py.in @@ -72,7 +72,6 @@ engineTmpDir = None engineUsrDir = None engineVarDir = None -engineLockDir = None engineContentDir = None engineDeploymentsDir = None @@ -237,7 +236,6 @@ global engineUsrDir global engineVarDir global engineCacheDir - global engineLockDir global engineServiceDir global engineContentDir global engineDeploymentsDir @@ -246,7 +244,6 @@ engineTmpDir = engineConfig.getString("ENGINE_TMP") engineUsrDir = engineConfig.getString("ENGINE_USR") engineVarDir = engineConfig.getString("ENGINE_VAR") - engineLockDir = engineConfig.getString("ENGINE_LOCK") engineCacheDir = engineConfig.getString("ENGINE_CACHE") engineServiceDir = os.path.join(engineUsrDir, "service") engineContentDir = os.path.join(engineVarDir, "content") @@ -335,7 +332,6 @@ checkDirectory(engineLogDir, uid=engineUid, gid=engineGid) checkDirectory(engineUsrDir) checkDirectory(engineVarDir, uid=engineUid, gid=engineGid) - checkDirectory(engineLockDir, uid=engineUid, gid=engineGid) checkDirectory(engineServiceDir) checkDirectory(engineContentDir, uid=engineUid, gid=engineGid) checkDirectory(engineDeploymentsDir, uid=engineUid, gid=engineGid) @@ -596,7 +592,6 @@ "ENGINE_USR": engineUsrDir, "ENGINE_VAR": engineVarDir, "ENGINE_CACHE": engineCacheDir, - "ENGINE_LOCK": engineLockDir, } # Finally execute the java virtual machine: diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index a4fb29c..0125707 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -30,7 +30,6 @@ %global engine_state %{_localstatedir}/lib/%{engine_name} %global engine_log %{_localstatedir}/log/%{engine_name} %global engine_run %{_localstatedir}/run/%{engine_name} -%global engine_lock %{_localstatedir}/lock/%{engine_name} %global engine_cache %{_localstatedir}/cache/%{engine_name} %global engine_tmp %{_localstatedir}/tmp/%{engine_name} @@ -95,7 +94,6 @@ PKG_PKI_DIR=%{engine_pki} \\\ PKG_JBOSS_MODULES=%{engine_jboss_modules} \\\ PKG_CACHE_DIR=%{engine_cache} \\\ - PKG_LOCK_DIR=%{engine_lock} \\\ PKG_LOG_DIR=%{engine_log} \\\ PKG_TMP_DIR=%{engine_tmp} \\\ %{?BUILD_FLAGS:BUILD_FLAGS="%{BUILD_FLAGS}"} \\\ @@ -283,7 +281,6 @@ install -dm 755 %{buildroot}/%{engine_state}/content install -dm 755 %{buildroot}/%{engine_log}/{host-deploy,notifier,engine-manage-domains} install -dm 755 %{buildroot}/%{engine_run}/notifier -install -dm 755 %{buildroot}/%{engine_lock} # Needed for compatibility if package is different than the directory structure %if "%{name}" != "%{engine_name}" @@ -414,7 +411,6 @@ %dir %{engine_data}/scripts %dir %{engine_run} %dir %attr(-, %{engine_user}, %{engine_group}) %{engine_log} -%dir %attr(-, %{engine_user}, %{engine_group}) %{engine_lock} # Log rotation script: %{engine_data}/scripts/ovirtlogrot.sh -- To view, visit http://gerrit.ovirt.org/13314 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8610a41c64d069a283e6ff3a04fa2cf827dd5540 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
