support hdp2_3

Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/362aef5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/362aef5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/362aef5e

Branch: refs/heads/master
Commit: 362aef5eca965d00a34ba3bbedd2b901b1679182
Parents: 38c9005
Author: traf <[email protected]>
Authored: Tue Mar 15 12:46:14 2016 +0000
Committer: traf <[email protected]>
Committed: Tue Mar 15 12:46:14 2016 +0000

----------------------------------------------------------------------
 core/sqf/conf/install_features | 2 +-
 core/sqf/sqenvcom.sh           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/362aef5e/core/sqf/conf/install_features
----------------------------------------------------------------------
diff --git a/core/sqf/conf/install_features b/core/sqf/conf/install_features
index 184670e..0fd7e98 100644
--- a/core/sqf/conf/install_features
+++ b/core/sqf/conf/install_features
@@ -62,5 +62,5 @@
 # verify the hadoop distro versions are correct as well as 
 # perform some additional support for this.
 export CDH_5_3_HDP_2_2_SUPPORT="N"
-export HDP_2_3_SUPPORT="N"
+export HDP_2_3_SUPPORT="Y"
 export CDH_5_4_SUPPORT="Y"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/362aef5e/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 6dadb19..a640793 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -380,8 +380,7 @@ elif [[ -n "$(ls /etc/init.d/ambari* 2>/dev/null)" ]]; then
   export HIVE_JAR_DIRS="/usr/hdp/current/hive-client/lib"
   export 
HIVE_JAR_FILES="/usr/hdp/current/hadoop-mapreduce-client/hadoop-mapreduce-client-core*.jar"
 
-  export HBASE_TRX_JAR=hbase-trx-hdp2_2-${TRAFODION_VER}.jar
-
+  export HBASE_TRX_JAR=${HBASE_TRX_ID_HDP}-${TRAFODION_VER}.jar
   # Configuration directories
 
   export HADOOP_CNF_DIR=/etc/hadoop/conf
@@ -573,6 +572,7 @@ EOF
     lv_hbase_cp=`hbase classpath`
 
     # end of code for Apache Hadoop/HBase installation w/o distro
+    export HBASE_TRX_JAR=${HBASE_TRX_ID_APACHE}-${TRAFODION_VER}.jar
   else
     # print usage information, not enough information about Hadoop/HBase
     vanilla_apache_usage

Reply via email to