You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/09/02 14:12:36 UTC
[09/16] git commit: AMBARI-7101. resource_management does not contain
needed files, after upgrade, on host with agent only.(vbrodetskyi)
AMBARI-7101. resource_management does not contain needed files, after upgrade,on host with agent only.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b6b1bf3a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b6b1bf3a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b6b1bf3a
Branch: refs/heads/branch-alerts-dev
Commit: b6b1bf3ae8f9c51db025b5db11f5f1b850367626
Parents: a41ef2a
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Mon Sep 1 17:07:39 2014 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Mon Sep 1 17:07:39 2014 +0300
----------------------------------------------------------------------
ambari-agent/conf/unix/install-helper.sh | 6 ------
ambari-server/conf/unix/install-helper.sh | 6 ------
2 files changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b6b1bf3a/ambari-agent/conf/unix/install-helper.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/install-helper.sh b/ambari-agent/conf/unix/install-helper.sh
index 0be3d2d..f17dd73 100644
--- a/ambari-agent/conf/unix/install-helper.sh
+++ b/ambari-agent/conf/unix/install-helper.sh
@@ -34,12 +34,6 @@ do_install(){
if [ ! -d "$COMMON_DIR" ]; then
ln -s "$COMMON_DIR_AGENT" "$COMMON_DIR"
fi
- # remove RESOURCE_MANAGEMENT_DIR if it's a directory
- if [ -d "$RESOURCE_MANAGEMENT_DIR" ]; then # resource_management dir exists
- if [ ! -L "$RESOURCE_MANAGEMENT_DIR" ]; then # resource_management dir is not link
- rm -rf "$RESOURCE_MANAGEMENT_DIR"
- fi
- fi
# setting resource_management shared resource
if [ ! -d "$RESOURCE_MANAGEMENT_DIR" ]; then
ln -s "$RESOURCE_MANAGEMENT_DIR_AGENT" "$RESOURCE_MANAGEMENT_DIR"
http://git-wip-us.apache.org/repos/asf/ambari/blob/b6b1bf3a/ambari-server/conf/unix/install-helper.sh
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/install-helper.sh b/ambari-server/conf/unix/install-helper.sh
index 751bcd0..f1624c2 100644
--- a/ambari-server/conf/unix/install-helper.sh
+++ b/ambari-server/conf/unix/install-helper.sh
@@ -33,12 +33,6 @@ do_install(){
if [ ! -d "$COMMON_DIR" ]; then
ln -s "$COMMON_DIR_SERVER" "$COMMON_DIR"
fi
- # remove RESOURCE_MANAGEMENT_DIR if it's a directory
- if [ -d "$RESOURCE_MANAGEMENT_DIR" ]; then # resource_management dir exists
- if [ ! -L "$RESOURCE_MANAGEMENT_DIR" ]; then # resource_management dir is not link
- rm -rf "$RESOURCE_MANAGEMENT_DIR"
- fi
- fi
# setting resource_management shared resource
if [ ! -d "$RESOURCE_MANAGEMENT_DIR" ]; then
ln -s "$RESOURCE_MANAGEMENT_DIR_SERVER" "$RESOURCE_MANAGEMENT_DIR"