Skip to content

Feature/remove hdp version attrs #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 5, 2017
Merged

Feature/remove hdp version attrs #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a04191f
add test for rendering hdp.version in HADOOP_OPTS with build number
dereklwood Aug 31, 2017
c528fc7
remove duplicate build-number attributes
dereklwood Aug 31, 2017
0784a1e
style autofixes
dereklwood Aug 31, 2017
e14b89a
rubocop fixes
dereklwood Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 3 additions & 50 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,54 +99,6 @@
end

# MapReduce settings
full_version =
case node['hadoop']['distribution_version']
when '2.2.0.0'
'2.2.0.0-2041'
when '2.2.1.0'
'2.2.1.0-2340'
when '2.2.4.2'
'2.2.4.2-2'
when '2.2.4.4'
'2.2.4.4-16'
when '2.2.6.0'
'2.2.6.0-2800'
when '2.2.6.3'
'2.2.6.3-1'
when '2.2.8.0'
'2.2.8.0-3150'
when '2.2.9.0'
'2.2.9.0-3393'
when '2.3.0.0'
'2.3.0.0-2557'
when '2.3.2.0'
'2.3.2.0-2950'
when '2.3.4.0'
'2.3.4.0-3485'
when '2.3.4.7'
'2.3.4.7-4'
when '2.3.6.0'
'2.3.6.0-3796'
when '2.4.0.0'
'2.4.0.0-169'
when '2.4.2.0'
'2.4.2.0-258'
when '2.4.3.0'
'2.4.3.0-227'
when '2.5.0.0'
'2.5.0.0-1245'
when '2.5.3.0'
'2.5.3.0-37'
when '2.5.5.0'
'2.5.5.0-157'
when '2.6.0.3'
'2.6.0.3-8'
when '2.6.1.0'
'2.6.1.0-129'
else
node['hadoop']['distribution_version']
end

default['hadoop']['hadoop_env']['hadoop_opts'] = '-Djava.net.preferIPv4Stack=true ${HADOOP_OPTS}'
default['hadoop']['mapred_env']['hadoop_opts'] = '-Djava.net.preferIPv4Stack=true ${HADOOP_OPTS}'

Expand All @@ -158,8 +110,9 @@

distro = node['hadoop']['distribution']
lzo_jar = distro == 'hdp' ? 'hadoop-lzo-0.6.0.${hdp.version}.jar' : 'hadoop-lzo-0.5.1.jar'
default['hadoop']['hadoop_env']['hadoop_opts'] += " -D#{distro}.version=#{full_version}"
default['hadoop']['mapred_env']['hadoop_opts'] += " -D#{distro}.version=#{full_version}"
# %{_FULL_VERSION} will be interpolated in the default recipe, when helper libraries are available
default['hadoop']['hadoop_env']['hadoop_opts'] += " -D#{distro}.version=%<_FULL_VERSION>s"
default['hadoop']['mapred_env']['hadoop_opts'] += " -D#{distro}.version=%<_FULL_VERSION>s"
default['hadoop']['mapred_site']['mapreduce.admin.map.child.java.opts'] =
"-server -Djava.net.preferIPv4Stack=true -D#{distro}.version=${#{distro}.version}"
default['hadoop']['mapred_site']['mapreduce.admin.user.env'] =
Expand Down
8 changes: 8 additions & 0 deletions recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,14 @@
# rubocop:enable Style/Next
end

# Evaluate any Delayed Interpolation tokens in *-env attributes
delayed_attrs = { _FULL_VERSION: hdp_version }
if node['hadoop'].key?(envfile) && !node['hadoop'][envfile].empty?
node['hadoop'][envfile].each do |k, v|
node.default['hadoop'][envfile][k] = v % delayed_attrs
end
end

template "#{hadoop_conf_dir}/#{envfile.tr('_', '-')}.sh" do
source 'generic-env.sh.erb'
mode '0755'
Expand Down
12 changes: 12 additions & 0 deletions spec/default_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,18 @@
)
end

it 'renders file hadoop-env.sh with HADOOP_OPTS containing the correct hdp.version' do
expect(chef_run).to render_file('/etc/hadoop/conf.chef/hadoop-env.sh').with_content(
/HADOOP_OPTS.*2.3.4.7-4/
)
end

it 'renders file mapred-env.sh with HADOOP_OPTS containing the correct hdp.version' do
expect(chef_run).to render_file('/etc/hadoop/conf.chef/mapred-env.sh').with_content(
/HADOOP_OPTS.*2.3.4.7-4/
)
end

it 'renders file hadoop-policy.xml with test.property' do
expect(chef_run).to render_file('/etc/hadoop/conf.chef/hadoop-policy.xml').with_content(
/test.property/
Expand Down