You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2014/10/10 21:01:26 UTC
[47/50] [abbrv] git commit: BUG-13755 MSI installer should support
installing, configuring, starting Oozie server on multiple nodes
BUG-13755 MSI installer should support installing, configuring, starting Oozie server on multiple nodes
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5d29917e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5d29917e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5d29917e
Branch: refs/heads/champlain
Commit: 5d29917e993a9498a243ce6f4f0908c752b58c9c
Parents: 616f309
Author: ivanmalamen <ma...@ukr.net>
Authored: Fri Oct 10 12:58:31 2014 +0300
Committer: ivanmalamen <ma...@ukr.net>
Committed: Fri Oct 10 12:58:31 2014 +0300
----------------------------------------------------------------------
hadoop-dist/src/win/scripts/InstallApi.psm1 | 2 +-
hadoop-dist/src/win/scripts/install.ps1 | 18 +++++++++++-------
2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d29917e/hadoop-dist/src/win/scripts/InstallApi.psm1
----------------------------------------------------------------------
diff --git a/hadoop-dist/src/win/scripts/InstallApi.psm1 b/hadoop-dist/src/win/scripts/InstallApi.psm1
index 1dd5613..b36720c 100644
--- a/hadoop-dist/src/win/scripts/InstallApi.psm1
+++ b/hadoop-dist/src/win/scripts/InstallApi.psm1
@@ -741,7 +741,7 @@ function UninstallHdfs(
### Stop and delete services
###
$services = @("namenode", "datanode", "secondarynamenode")
- if ((Test-Path ENV:HA) -and ($ENV:HA -eq "yes"))
+ if ((Test-Path ENV:IS_HDFS_HA) -and ($ENV:IS_HDFS_HA -eq "yes"))
{
$services+=@("journalnode","zkfc")
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d29917e/hadoop-dist/src/win/scripts/install.ps1
----------------------------------------------------------------------
diff --git a/hadoop-dist/src/win/scripts/install.ps1 b/hadoop-dist/src/win/scripts/install.ps1
index d9c54e0..425fdfb 100644
--- a/hadoop-dist/src/win/scripts/install.ps1
+++ b/hadoop-dist/src/win/scripts/install.ps1
@@ -144,7 +144,7 @@ function Main( $scriptDir )
}
if (($role -eq "NAMENODE") -or ($role -eq "NN_HA_STANDBY_NAMENODE")) {
$hdfsroles = $hdfsroles+" "+"namenode"
- if ($ENV:HA -ieq "yes") {
+ if ($ENV:IS_HDFS_HA -ieq "yes") {
$hdfsroles = $hdfsroles+" "+"zkfc"
}
}
@@ -154,7 +154,7 @@ function Main( $scriptDir )
if ($role -eq "SECONDARYNAMENODE" ) {
$hdfsroles = $hdfsroles+" "+"secondarynamenode"
}
- if (($role -eq "RM_HA_STANDBY_RESOURCEMANAGER" ) -and ($ENV:HA -ieq "yes")) {
+ if (($role -eq "RM_HA_STANDBY_RESOURCEMANAGER" ) -and ($ENV:IS_HDFS_HA -ieq "yes")) {
$hdfsroles = $hdfsroles+" "+"zkfc"
$yarnRoles = $yarnRoles+" "+"resourcemanager"
$yarnRoles = $yarnRoles+" "+"timelineserver"
@@ -195,7 +195,11 @@ function Main( $scriptDir )
### Prepare the proxyuser hosts
$proxyHostsList = @()
$proxyHostsList += GetIPAddress $ENV:HIVE_SERVER_HOST
- $proxyHostsList += GetIPAddress $ENV:OOZIE_SERVER_HOST
+ $oozie_hosts = ($ENV:OOZIE_SERVER_HOST.Split(",") | foreach { $_.Trim() })
+ foreach ($shost in $oozie_hosts)
+ {
+ $proxyHostsList += GetIPAddress $shost
+ }
$proxyHostsList += GetIPAddress $ENV:WEBHCAT_HOST
$proxyHostsList = $proxyHostsList | Select -Uniq
$proxyHosts = ($proxyHostsList -Join ',')
@@ -233,7 +237,7 @@ function Main( $scriptDir )
Write-Log "HDFS usage detected. Configuring HDP to use HDFS as default filesystem"
$coreConfigs["fs.defaultFS"] = "hdfs://${ENV:NAMENODE_HOST}:8020"
- if ($ENV:HA -ieq "yes") {
+ if ($ENV:IS_HDFS_HA -ieq "yes") {
$coreConfigs["fs.defaultFS"] = "hdfs://${ENV:NN_HA_CLUSTER_NAME}"
$zookeeperNodes = $zookeeperNodes = $env:ZOOKEEPER_HOSTS.Replace(",",":2181,")
$zookeeperNodes = $zookeeperNodes + ":2181"
@@ -308,7 +312,7 @@ function Main( $scriptDir )
"dfs.hosts" = "${hadoopInstallDir}\etc\hadoop\dfs.include";
"dfs.hosts.exclude" = "${hadoopInstallDir}\etc\hadoop\dfs.exclude";
"dfs.support.append" = "true"}
- if ($ENV:HA -ieq "yes") {
+ if ($ENV:IS_HDFS_HA -ieq "yes") {
$hdfsConfigs["dfs.nameservices"] = "${ENV:NN_HA_CLUSTER_NAME}"
$hdfsConfigs["dfs.ha.namenodes.${ENV:NN_HA_CLUSTER_NAME}"] = "nn1,nn2"
$hdfsConfigs["dfs.namenode.rpc-address.${ENV:NN_HA_CLUSTER_NAME}.nn1"] = "${ENV:NAMENODE_HOST}:8020"
@@ -388,7 +392,7 @@ function Main( $scriptDir )
"yarn.nodemanager.log-dirs" = "$NMAndMRLogDir" ;
"yarn.nodemanager.local-dirs" = "$NMAndMRLocalDir" ;
"yarn.timeline-service.hostname" = "${ENV:RESOURCEMANAGER_HOST}".ToLower() }
- if ($ENV:HA -ieq "yes") {
+ if ($ENV:IS_HDFS_HA -ieq "yes") {
$yarnConfigs += @{
"yarn.resourcemanager.ha.enabled" = "true";
"yarn.resourcemanager.ha.rm-ids" = "rm1,rm2";
@@ -427,7 +431,7 @@ function Main( $scriptDir )
"mapreduce.map.java.opts" = "-Xmx756m";
"mapreduce.cluster.local.dir" = "$NMAndMRLocalDir" }
- if ((Test-Path ENV:HA) -and ($ENV:HA -ieq "yes")) {
+ if ((Test-Path ENV:IS_HDFS_HA) -and ($ENV:IS_HDFS_HA -ieq "yes")) {
$mapredConfigs["mapreduce.am.max-attempts"] = "20"
}
if ((Test-Path ENV:ENABLE_GZIP) -and ($ENV:ENABLE_GZIP -ieq "yes")) {