AMBARI-9824. Metrics Collector going down on stack versions 2.1 and 2.0. (swagle)

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml

@@ -126,8 +126,9 @@ export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS -Djava.security.auth.login.co
 # use embedded native libs
 _HADOOP_NATIVE_LIB="/usr/lib/ams-hbase/lib/hadoop-native/"
 export HBASE_OPTS="$HBASE_OPTS -Djava.library.path=${_HADOOP_NATIVE_LIB}"
+
 # Unset HADOOP_HOME to avoid importing HADOOP installed cluster related configs like: /usr/hdp/2.2.0.0-2041/hadoop/conf/
-export HADOOP_HOME=`pwd`
+export HADOOP_HOME={{ams_hbase_home_dir}}
     </value>
   </property>
 

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py

@@ -182,6 +182,12 @@ def ams(name=None):
               recursive=True
     )
 
+    # Hack to allow native HBase libs to be included for embedded hbase
+    File(os.path.join(params.ams_hbase_home_dir, "bin", "hadoop"),
+         owner=params.ams_user,
+         mode=0755
+    )
+
     pass
 
   elif name == 'monitor':

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py

@@ -50,7 +50,7 @@ ams_monitor_dir = "/usr/lib/python2.6/site-packages/resource_monitoring"
 ams_monitor_pid_dir = status_params.ams_monitor_pid_dir
 ams_monitor_script = "/usr/sbin/ambari-metrics-monitor"
 
-
+ams_hbase_home_dir = "/usr/lib/ams-hbase/"
 
 #hadoop params
 

ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py

@@ -34,7 +34,7 @@ if rpm_version is not None:
   #RPM versioning support
   rpm_version = default("/configurations/hadoop-env/rpm_version", None)
 
-hadoop_native_lib = format("/usr/lib/hadoop/lib/native")
+hadoop_native_lib = format("/usr/lib/ams-hbase/lib/hadoop-native")
 hadoop_bin_dir = "/usr/bin"
 daemon_script = "/usr/lib/ams-hbase/bin/hbase-daemon.sh"
 region_mover = "/usr/lib/ams-hbase/bin/region_mover.rb"