You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2017/03/22 06:10:19 UTC
[28/52] bigtop git commit: Making ODPi Ambari stack compatible with
ODPi packaging
Making ODPi Ambari stack compatible with ODPi packaging
(cherry picked from commit 40465c12191dc22beca5b72952ecf2721893ca0d)
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d7c2a9a3
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d7c2a9a3
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d7c2a9a3
Branch: refs/heads/master
Commit: d7c2a9a3d80604e2777a79a0bccf6f2bb485a686
Parents: aab5273
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Fri Oct 28 10:54:16 2016 -0700
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Tue Mar 21 23:08:09 2017 -0700
----------------------------------------------------------------------
.../services/HIVE/configuration/hive-site.xml | 2 +-
.../HIVE/package/files/templetonSmoke.sh | 37 --------------------
2 files changed, 1 insertion(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d7c2a9a3/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-site.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-site.xml
index cddb624..c1f2a98 100755
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-site.xml
+++ b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-site.xml
@@ -2167,7 +2167,7 @@
<property_depended_by/>
</property><property require-input="false">
<name>hive.execution.engine</name>
- <value>tez</value>
+ <value>mr</value>
<description>
Expects one of [mr, tez].
Chooses execution engine. Options are: mr (Map reduce, default) or tez (hadoop 2 only)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d7c2a9a3/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/files/templetonSmoke.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/files/templetonSmoke.sh b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/files/templetonSmoke.sh
index dd61631..0ab94fe 100755
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/files/templetonSmoke.sh
+++ b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/files/templetonSmoke.sh
@@ -55,41 +55,4 @@ if [[ "$httpExitCode" -ne "200" ]] ; then
exit 1
fi
-#try hcat ddl command
-/var/lib/ambari-agent/ambari-sudo.sh rm -f ${tmp_dir}/show_db.post.txt
-echo "user.name=${smoke_test_user}&exec=show databases;" > ${tmp_dir}/show_db.post.txt
-/var/lib/ambari-agent/ambari-sudo.sh chown ${smoke_test_user} ${tmp_dir}/show_db.post.txt
-cmd="${kinitcmd}curl --negotiate -u : -s -w 'http_code <%{http_code}>' -d @${tmp_dir}/show_db.post.txt $ttonurl/ddl 2>&1"
-retVal=`/var/lib/ambari-agent/ambari-sudo.sh su ${smoke_test_user} -s /bin/bash - -c "$cmd"`
-httpExitCode=`echo $retVal |sed 's/.*http_code <\([0-9]*\)>.*/\1/'`
-
-if [[ "$httpExitCode" -ne "200" ]] ; then
- echo "Templeton Smoke Test (ddl cmd): Failed. : $retVal"
- export TEMPLETON_EXIT_CODE=1
- exit 1
-fi
-
-# NOT SURE?? SUHAS
-if [[ $security_enabled == "true" ]]; then
- echo "Templeton Pig Smoke Tests not run in secure mode"
- exit 0
-fi
-
-#try pig query
-
-#create, copy post args file
-/var/lib/ambari-agent/ambari-sudo.sh rm -f ${tmp_dir}/pig_post.txt
-echo -n "user.name=${smoke_test_user}&file=/tmp/$ttonTestScript" > ${tmp_dir}/pig_post.txt
-/var/lib/ambari-agent/ambari-sudo.sh chown ${smoke_test_user} ${tmp_dir}/pig_post.txt
-
-#submit pig query
-cmd="curl --negotiate -u : -s -w 'http_code <%{http_code}>' -d @${tmp_dir}/pig_post.txt $ttonurl/pig 2>&1"
-retVal=`/var/lib/ambari-agent/ambari-sudo.sh su ${smoke_test_user} -s /bin/bash - -c "$cmd"`
-httpExitCode=`echo $retVal |sed 's/.*http_code <\([0-9]*\)>.*/\1/'`
-if [[ "$httpExitCode" -ne "200" ]] ; then
- echo "Templeton Smoke Test (pig cmd): Failed. : $retVal"
- export TEMPLETON_EXIT_CODE=1
- exit 1
-fi
-
exit 0