You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2014/02/08 00:54:04 UTC
git commit: AMBARI-4564. WebHCat failed to start. (mahadev)
Updated Branches:
refs/heads/trunk a687e1b20 -> 6516491ed
AMBARI-4564. WebHCat failed to start. (mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6516491e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6516491e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6516491e
Branch: refs/heads/trunk
Commit: 6516491ed3ff3a3c7bffb694d4a59c961400dc16
Parents: a687e1b
Author: Mahadev Konar <ma...@apache.org>
Authored: Fri Feb 7 15:53:01 2014 -0800
Committer: Mahadev Konar <ma...@apache.org>
Committed: Fri Feb 7 15:53:08 2014 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py | 2 +-
.../src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6516491e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py
index c013624..c56f1c5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py
@@ -66,7 +66,7 @@ def webhcat():
path='/bin'
)
- copyFromLocal(path='/usr/lib/hadoop-mapreduce/hadoop-streaming*.jar',
+ copyFromLocal(path='/usr/lib/hadoop-mapreduce/hadoop-streaming-*.jar',
owner=params.webhcat_user,
mode=0755,
dest_dir=format("{webhcat_apps_dir}/hadoop-streaming.jar"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/6516491e/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py
index f06c5c9..83ca8f2 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py
@@ -126,7 +126,7 @@ class TestWebHCatServer(RMFTestCase):
owner = 'hcat',
group = 'hadoop',
)
- self.assertResourceCalled('ExecuteHadoop', 'fs -copyFromLocal /usr/lib/hadoop-mapreduce/hadoop-streaming*.jar /apps/webhcat/hadoop-streaming.jar',
+ self.assertResourceCalled('ExecuteHadoop', 'fs -copyFromLocal /usr/lib/hadoop-mapreduce/hadoop-streaming-*.jar /apps/webhcat/hadoop-streaming.jar',
not_if = ' hadoop fs -ls /apps/webhcat/hadoop-streaming.jar >/dev/null 2>&1',
user = 'hcat',
conf_dir = '/etc/hadoop/conf',
@@ -174,7 +174,7 @@ class TestWebHCatServer(RMFTestCase):
path = ['/bin'],
user = 'hcat',
)
- self.assertResourceCalled('ExecuteHadoop', 'fs -copyFromLocal /usr/lib/hadoop-mapreduce/hadoop-streaming*.jar /apps/webhcat/hadoop-streaming.jar',
+ self.assertResourceCalled('ExecuteHadoop', 'fs -copyFromLocal /usr/lib/hadoop-mapreduce/hadoop-streaming-*.jar /apps/webhcat/hadoop-streaming.jar',
not_if = '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; hadoop fs -ls /apps/webhcat/hadoop-streaming.jar >/dev/null 2>&1',
user = 'hcat',
conf_dir = '/etc/hadoop/conf',