This is an automated email from the ASF dual-hosted git repository.
mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo-muchos.git
The following commit(s) were added to refs/heads/master by this push:
new 6e786a0 More updates (#235)
6e786a0 is described below
commit 6e786a0f43e4be01ce15fe1bf9fc7aeafd46739f
Author: Mike Walch <[email protected]>
AuthorDate: Thu Oct 25 11:10:40 2018 -0400
More updates (#235)
* Fixed unit tests
* Updates to start-yarn.sh for Hadoop 3
---
ansible/roles/hadoop/tasks/start-yarn.yml | 9 ++++++++-
lib/tests/test_config.py | 6 +++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ansible/roles/hadoop/tasks/start-yarn.yml
b/ansible/roles/hadoop/tasks/start-yarn.yml
index 7477e87..cd4a4ea 100644
--- a/ansible/roles/hadoop/tasks/start-yarn.yml
+++ b/ansible/roles/hadoop/tasks/start-yarn.yml
@@ -1,4 +1,11 @@
-- name: "start yarn"
+- name: "start hadoop yarn 2.x"
command: "{{ hadoop_home }}/sbin/start-yarn.sh"
register: start_yarn_result
changed_when: start_yarn_result.stdout | search("starting
(:?resource|node)manager")
+ when: hadoop_major_version == '2'
+- name: "start hadoop yarn 3.x"
+ command: "nohup {{ hadoop_home }}/sbin/start-yarn.sh"
+ register: start_yarn_result
+ changed_when: start_yarn_result.rc == 0
+ failed_when: start_yarn_result.rc >= 2
+ when: hadoop_major_version == '3'
diff --git a/lib/tests/test_config.py b/lib/tests/test_config.py
index 4502cd6..f708162 100644
--- a/lib/tests/test_config.py
+++ b/lib/tests/test_config.py
@@ -19,7 +19,7 @@ def test_defaults():
c = DeployConfig("muchos", '../conf/muchos.props.example',
'../conf/hosts/example/example_cluster',
'../conf/checksums', 'mycluster')
assert c.checksum_ver('accumulo', '1.9.0') ==
'f68a6145029a9ea843b0305c90a7f5f0334d8a8ceeea94734267ec36421fe7fe'
- assert c.checksum('accumulo') ==
'c23c147e6abde5e6b851cf27f91b813705dc41d07c2bfea798a86abb144255d5'
+ assert c.checksum('accumulo') ==
'baa5e0929248ff0d96355bc7fb42a5b75d183a83364519296e07b0adbb089180'
assert c.get('ec2', 'default_instance_type') == 'm5d.large'
assert c.get('ec2', 'worker_instance_type') == 'm5d.large'
assert c.get('ec2', 'aws_ami') == 'ami-9887c6e7'
@@ -46,9 +46,9 @@ def test_defaults():
assert c.get_public_ip('leader1') == '23.0.0.0'
assert c.get_private_ip('leader1') == '10.0.0.0'
assert c.cluster_name == 'mycluster'
- assert c.version("accumulo").startswith('1.')
+ assert c.version("accumulo").startswith('2.')
assert c.version("fluo").startswith('1.')
- assert c.version("hadoop").startswith('2.')
+ assert c.version("hadoop").startswith('3.')
assert c.version("zookeeper").startswith('3.')
assert c.get_service_private_ips("worker") == ['10.0.0.2', '10.0.0.3',
'10.0.0.4', '10.0.0.5']
assert c.get('general', 'proxy_hostname') == "leader1"
