浏览代码

AMBARI-7101. resource_management does not contain needed files, after upgrade,on host with agent only.(vbrodetskyi)

Vitaly Brodetskyi 10 年之前
父节点
当前提交
b6b1bf3ae8
共有 2 个文件被更改,包括 0 次插入12 次删除
  1. 0 6
      ambari-agent/conf/unix/install-helper.sh
  2. 0 6
      ambari-server/conf/unix/install-helper.sh

+ 0 - 6
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"

+ 0 - 6
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"