You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/10/07 15:51:57 UTC
[16/31] ambari git commit: AMBARI-13242. AMBARI-13242: ambari-server
setup failed if use another server as ambari-server next time (Di Li via
aonishuk)
AMBARI-13242. AMBARI-13242: ambari-server setup failed if use another server as ambari-server next time (Di Li via aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/329d2b54
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/329d2b54
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/329d2b54
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 329d2b5424492eac6c6b16f3e85ce5e33da6f51f
Parents: 93f0896
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Oct 5 23:57:25 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Oct 5 23:57:25 2015 +0300
----------------------------------------------------------------------
ambari-agent/conf/unix/install-helper.sh | 20 +++++++++++++++++++
ambari-server/conf/unix/install-helper.sh | 27 +++++++++++++++++++++++++-
2 files changed, 46 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/329d2b54/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 35c67fb..185290c 100644
--- a/ambari-agent/conf/unix/install-helper.sh
+++ b/ambari-agent/conf/unix/install-helper.sh
@@ -68,6 +68,26 @@ do_remove(){
if [ -f "$PYTHON_WRAPER_TARGET" ]; then
rm -f "$PYTHON_WRAPER_TARGET"
fi
+
+ if [ -d "$COMMON_DIR" ]; then
+ rm -f $COMMON_DIR
+ fi
+
+ if [ -d "$RESOURCE_MANAGEMENT_DIR" ]; then
+ rm -rf $RESOURCE_MANAGEMENT_DIR
+ fi
+
+ if [ -d "$JINJA_DIR" ]; then
+ rm -rf $JINJA_DIR
+ fi
+
+ if [ -d "$SIMPLEJSON_DIR" ]; then
+ rm -f $SIMPLEJSON_DIR
+ fi
+
+ if [ -d "$OLD_COMMON_DIR" ]; then
+ rm -f $OLD_COMMON_DIR
+ fi
# if server package exists, restore their settings
if [ -f "$INSTALL_HELPER_SERVER" ]; then # call server shared files installer
http://git-wip-us.apache.org/repos/asf/ambari/blob/329d2b54/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 9dbb2b8..2635694 100644
--- a/ambari-server/conf/unix/install-helper.sh
+++ b/ambari-server/conf/unix/install-helper.sh
@@ -22,6 +22,7 @@ RESOURCE_MANAGEMENT_DIR="/usr/lib/python2.6/site-packages/resource_management"
JINJA_DIR="/usr/lib/python2.6/site-packages/ambari_jinja2"
SIMPLEJSON_DIR="/usr/lib/python2.6/site-packages/ambari_simplejson"
OLD_COMMON_DIR="/usr/lib/python2.6/site-packages/common_functions"
+AMBARI_SERVER="/usr/lib/python2.6/site-packages/ambari_server"
INSTALL_HELPER_AGENT="/var/lib/ambari-agent/install-helper.sh"
COMMON_DIR_SERVER="/usr/lib/ambari-server/lib/ambari_commons"
RESOURCE_MANAGEMENT_DIR_SERVER="/usr/lib/ambari-server/lib/resource_management"
@@ -61,9 +62,33 @@ do_remove(){
rm -f "$PYTHON_WRAPER_TARGET"
fi
+ if [ -d "$COMMON_DIR" ]; then
+ rm -f $COMMON_DIR
+ fi
+
+ if [ -d "$RESOURCE_MANAGEMENT_DIR" ]; then
+ rm -f $RESOURCE_MANAGEMENT_DIR
+ fi
+
+ if [ -d "$JINJA_DIR" ]; then
+ rm -f $JINJA_DIR
+ fi
+
+ if [ -d "$SIMPLEJSON_DIR" ]; then
+ rm -f $SIMPLEJSON_DIR
+ fi
+
+ if [ -d "$OLD_COMMON_DIR" ]; then
+ rm -rf $OLD_COMMON_DIR
+ fi
+
+ if [ -d "$AMBARI_SERVER" ]; then
+ rm -rf "$AMBARI_SERVER"
+ fi
+
# if server package exists, restore their settings
if [ -f "$INSTALL_HELPER_AGENT" ]; then # call agent shared files installer
- $INSTALL_HELPER_AGENT install
+ $INSTALL_HELPER_AGENT install
fi
}