Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/76722
Change subject: Puppetizing Hadoop JournalNode. ...................................................................... Puppetizing Hadoop JournalNode. This commit depends on https://gerrit.wikimedia.org/r/#/c/76018/ and is NOT READY FOR REVIEW. Change-Id: I160b898a547bd575f1126ba93c3b0e509706a65c --- M manifests/role/analytics/hadoop.pp 1 file changed, 32 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/22/76722/1 diff --git a/manifests/role/analytics/hadoop.pp b/manifests/role/analytics/hadoop.pp index 817c8ec..0f69bef 100644 --- a/manifests/role/analytics/hadoop.pp +++ b/manifests/role/analytics/hadoop.pp @@ -50,6 +50,12 @@ include cdh4::hadoop::worker } +# == Class role::analytics::hadoop::standby inherits role::analytics::hadoop::client +# +class role::analytics::hadoop::standby inherits role::analytics::hadoop::client { + system_role { 'role::analytics::hadoop::worker': description => 'Hadoop Standby NameNode' } + include cdh4::hadoop::namenode::standby +} ### The following classes should not be included directly. @@ -61,8 +67,9 @@ # == Class role::analytics::hadoop::production # Common hadoop configs for the production Kraken cluster # +# TODO: Setup Standby NameNode class role::analytics::hadoop::production { - $namenode_hostname = 'analytics1010.eqiad.wmnet' + $namenode_hostnames = 'analytics1010.eqiad.wmnet' $hadoop_name_directory = '/var/lib/hadoop/name' $hadoop_data_directory = '/var/lib/hadoop/data' @@ -80,7 +87,7 @@ ] class { 'cdh4::hadoop': - namenode_hostname => $namenode_hostname, + namenode_hostnames => $namenode_hostnames, datanode_mounts => $datanode_mounts, dfs_name_dir => [$hadoop_name_directory], dfs_block_size => 268435456, # 256 MB @@ -122,13 +129,25 @@ # this nodes $::fqdn. # class role::analytics::hadoop::labs { - # if the global variable $::hadoop_namenode is set, - # use it as the namenode_hostname. This allows + # if the global variable $::hadoop_namenodes is set, + # use it as the namenode_hostnames. This allows # configuration via the Labs Instance configuration page. - $namenode_hostname = $::hadoop_namenode ? { - undef => $::fqdn, - default => "${::hadoop_namenode}.${domain}", + $namenode_hostnames = $::hadoop_namenodes ? { + undef => $::fqdn, + default => split($::hadoop_namenodes, ','), + } + + $journalnode_hostnames = $::hadoop_journalnodes ? { + undef => undef, + default => split($::hadoop_journalnodes, ','), + } + + $nameservice_id = $::hadoop_nameservice_id ? { + undef => undef, + default => $::hadoop_nameservice_id, + } + $hadoop_name_directory = '/var/lib/hadoop/name' @@ -138,6 +157,8 @@ "$hadoop_data_directory/b", ] + $hadoop_journal_directory = '/var/lib/hadoop/journal' + # We don't have to create any partions in labs, so it # is unlikely that /var/lib/hadoop and $hadoop_data_directory # will be created manually. Ensure it and datanode_mounts exist. @@ -146,9 +167,12 @@ } class { 'cdh4::hadoop': - namenode_hostname => $namenode_hostname, + namenode_hostnames => $namenode_hostnames, + nameservice_id => $nameservice_id, + journalnode_hostnames => $journalnode_hostnames, datanode_mounts => $datanode_mounts, dfs_name_dir => [$hadoop_name_directory], + dfs_journalnode_edits_dir => $hadoop_journal_directory, dfs_block_size => 268435456, # 256 MB io_file_buffer_size => 131072, mapreduce_map_tasks_maximum => 2, -- To view, visit https://gerrit.wikimedia.org/r/76722 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I160b898a547bd575f1126ba93c3b0e509706a65c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
