Repository: ambari Updated Branches: refs/heads/trunk c0f5f01da -> 33335cef4
AMBARI-7101. resource_management does not contain needed files, after upgradeon 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/33335cef Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33335cef Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33335cef Branch: refs/heads/trunk Commit: 33335cef438369a40c4486ad2b76180676a2dd58 Parents: c0f5f01 Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Tue Sep 2 17:26:53 2014 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Tue Sep 2 17:26:53 2014 +0300 ---------------------------------------------------------------------- ambari-agent/src/main/package/rpm/posttrans_agent.sh | 6 ++++++ ambari-server/src/main/package/rpm/posttrans_server.sh | 6 ++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/33335cef/ambari-agent/src/main/package/rpm/posttrans_agent.sh ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/package/rpm/posttrans_agent.sh b/ambari-agent/src/main/package/rpm/posttrans_agent.sh index 15f824b..caabb33 100644 --- a/ambari-agent/src/main/package/rpm/posttrans_agent.sh +++ b/ambari-agent/src/main/package/rpm/posttrans_agent.sh @@ -17,6 +17,12 @@ RESOURCE_MANAGEMENT_DIR="/usr/lib/python2.6/site-packages/resource_management" RESOURCE_MANAGEMENT_DIR_AGENT="/usr/lib/ambari-agent/lib/resource_management" +# 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/33335cef/ambari-server/src/main/package/rpm/posttrans_server.sh ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/package/rpm/posttrans_server.sh b/ambari-server/src/main/package/rpm/posttrans_server.sh index 43478f4..04e4532 100644 --- a/ambari-server/src/main/package/rpm/posttrans_server.sh +++ b/ambari-server/src/main/package/rpm/posttrans_server.sh @@ -17,6 +17,12 @@ RESOURCE_MANAGEMENT_DIR="/usr/lib/python2.6/site-packages/resource_management" RESOURCE_MANAGEMENT_DIR_SERVER="/usr/lib/ambari-server/lib/resource_management" +# 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"
