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 sh...@apache.org on 2018/09/18 02:06:22 UTC
[46/50] [abbrv] hadoop git commit: Merge commit
'9af96d4ed4b6f80d3ca53a2b003d2ef768650dd4' into HDFS-12943
Merge commit '9af96d4ed4b6f80d3ca53a2b003d2ef768650dd4' into HDFS-12943
# Conflicts:
# hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSHighAvailabilityWithQJM.md
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1363eff6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1363eff6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1363eff6
Branch: refs/heads/HDFS-12943
Commit: 1363eff69c36c4f2085194b59a86370505cc00cd
Parents: 94d7f90 9af96d4
Author: Konstantin V Shvachko <sh...@apache.org>
Authored: Mon Sep 17 17:39:11 2018 -0700
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Mon Sep 17 17:39:11 2018 -0700
----------------------------------------------------------------------
.../hadoop-common/src/main/bin/start-all.cmd | 104 +++++++++----------
.../hadoop-common/src/main/bin/stop-all.cmd | 104 +++++++++----------
.../org/apache/hadoop/http/IsActiveServlet.java | 71 +++++++++++++
.../apache/hadoop/http/TestIsActiveServlet.java | 95 +++++++++++++++++
.../router/IsRouterActiveServlet.java | 37 +++++++
.../federation/router/RouterHttpServer.java | 9 ++
.../src/site/markdown/HDFSRouterFederation.md | 2 +-
.../hadoop-hdfs/src/main/bin/hdfs-config.cmd | 86 +++++++--------
.../hadoop-hdfs/src/main/bin/start-dfs.cmd | 82 +++++++--------
.../hadoop-hdfs/src/main/bin/stop-dfs.cmd | 82 +++++++--------
.../namenode/IsNameNodeActiveServlet.java | 33 ++++++
.../server/namenode/NameNodeHttpServer.java | 3 +
.../markdown/HDFSHighAvailabilityWithQJM.md | 8 ++
hadoop-mapreduce-project/bin/mapred-config.cmd | 86 +++++++--------
.../hadoop-streaming/src/test/bin/cat.cmd | 36 +++----
.../hadoop-streaming/src/test/bin/xargs_cat.cmd | 36 +++----
.../hadoop-yarn/bin/start-yarn.cmd | 94 ++++++++---------
.../hadoop-yarn/bin/stop-yarn.cmd | 94 ++++++++---------
.../IsResourceManagerActiveServlet.java | 38 +++++++
.../server/resourcemanager/ResourceManager.java | 5 +
.../resourcemanager/webapp/RMWebAppFilter.java | 3 +-
.../src/site/markdown/ResourceManagerHA.md | 5 +
22 files changed, 709 insertions(+), 404 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1363eff6/hadoop-common-project/hadoop-common/src/main/bin/start-all.cmd
----------------------------------------------------------------------
diff --cc hadoop-common-project/hadoop-common/src/main/bin/start-all.cmd
index 9f65b5d,9f65b5d..805cfbe
--- a/hadoop-common-project/hadoop-common/src/main/bin/start-all.cmd
+++ b/hadoop-common-project/hadoop-common/src/main/bin/start-all.cmd
@@@ -1,52 -1,52 +1,52 @@@
--@echo off
--@rem Licensed to the Apache Software Foundation (ASF) under one or more
--@rem contributor license agreements. See the NOTICE file distributed with
--@rem this work for additional information regarding copyright ownership.
--@rem The ASF licenses this file to You under the Apache License, Version 2.0
--@rem (the "License"); you may not use this file except in compliance with
--@rem the License. You may obtain a copy of the License at
--@rem
--@rem http://www.apache.org/licenses/LICENSE-2.0
--@rem
--@rem Unless required by applicable law or agreed to in writing, software
--@rem distributed under the License is distributed on an "AS IS" BASIS,
--@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--@rem See the License for the specific language governing permissions and
--@rem limitations under the License.
--
--setlocal enabledelayedexpansion
--
--@rem Start all hadoop daemons. Run this on master node.
--
--echo This script is Deprecated. Instead use start-dfs.cmd and start-yarn.cmd
--
--if not defined HADOOP_BIN_PATH (
-- set HADOOP_BIN_PATH=%~dp0
--)
--
--if "%HADOOP_BIN_PATH:~-1%" == "\" (
-- set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
--)
--
--set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
--if not defined HADOOP_LIBEXEC_DIR (
-- set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
--)
--
--call %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd %*
--if "%1" == "--config" (
-- shift
-- shift
--)
--
--@rem start hdfs daemons if hdfs is present
--if exist %HADOOP_HDFS_HOME%\sbin\start-dfs.cmd (
-- call %HADOOP_HDFS_HOME%\sbin\start-dfs.cmd --config %HADOOP_CONF_DIR%
--)
--
--@rem start yarn daemons if yarn is present
--if exist %HADOOP_YARN_HOME%\sbin\start-yarn.cmd (
-- call %HADOOP_YARN_HOME%\sbin\start-yarn.cmd --config %HADOOP_CONF_DIR%
--)
--
--endlocal
++@echo off
++@rem Licensed to the Apache Software Foundation (ASF) under one or more
++@rem contributor license agreements. See the NOTICE file distributed with
++@rem this work for additional information regarding copyright ownership.
++@rem The ASF licenses this file to You under the Apache License, Version 2.0
++@rem (the "License"); you may not use this file except in compliance with
++@rem the License. You may obtain a copy of the License at
++@rem
++@rem http://www.apache.org/licenses/LICENSE-2.0
++@rem
++@rem Unless required by applicable law or agreed to in writing, software
++@rem distributed under the License is distributed on an "AS IS" BASIS,
++@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++@rem See the License for the specific language governing permissions and
++@rem limitations under the License.
++
++setlocal enabledelayedexpansion
++
++@rem Start all hadoop daemons. Run this on master node.
++
++echo This script is Deprecated. Instead use start-dfs.cmd and start-yarn.cmd
++
++if not defined HADOOP_BIN_PATH (
++ set HADOOP_BIN_PATH=%~dp0
++)
++
++if "%HADOOP_BIN_PATH:~-1%" == "\" (
++ set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
++)
++
++set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
++if not defined HADOOP_LIBEXEC_DIR (
++ set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
++)
++
++call %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd %*
++if "%1" == "--config" (
++ shift
++ shift
++)
++
++@rem start hdfs daemons if hdfs is present
++if exist %HADOOP_HDFS_HOME%\sbin\start-dfs.cmd (
++ call %HADOOP_HDFS_HOME%\sbin\start-dfs.cmd --config %HADOOP_CONF_DIR%
++)
++
++@rem start yarn daemons if yarn is present
++if exist %HADOOP_YARN_HOME%\sbin\start-yarn.cmd (
++ call %HADOOP_YARN_HOME%\sbin\start-yarn.cmd --config %HADOOP_CONF_DIR%
++)
++
++endlocal
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1363eff6/hadoop-common-project/hadoop-common/src/main/bin/stop-all.cmd
----------------------------------------------------------------------
diff --cc hadoop-common-project/hadoop-common/src/main/bin/stop-all.cmd
index 1d22c79,1d22c79..15db82a
--- a/hadoop-common-project/hadoop-common/src/main/bin/stop-all.cmd
+++ b/hadoop-common-project/hadoop-common/src/main/bin/stop-all.cmd
@@@ -1,52 -1,52 +1,52 @@@
--@echo off
--@rem Licensed to the Apache Software Foundation (ASF) under one or more
--@rem contributor license agreements. See the NOTICE file distributed with
--@rem this work for additional information regarding copyright ownership.
--@rem The ASF licenses this file to You under the Apache License, Version 2.0
--@rem (the "License"); you may not use this file except in compliance with
--@rem the License. You may obtain a copy of the License at
--@rem
--@rem http://www.apache.org/licenses/LICENSE-2.0
--@rem
--@rem Unless required by applicable law or agreed to in writing, software
--@rem distributed under the License is distributed on an "AS IS" BASIS,
--@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--@rem See the License for the specific language governing permissions and
--@rem limitations under the License.
--
--setlocal enabledelayedexpansion
--
--@rem Stop all hadoop daemons. Run this on master node.
--
--echo This script is Deprecated. Instead use stop-dfs.cmd and stop-yarn.cmd
--
--if not defined HADOOP_BIN_PATH (
-- set HADOOP_BIN_PATH=%~dp0
--)
--
--if "%HADOOP_BIN_PATH:~-1%" == "\" (
-- set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
--)
--
--set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
--if not defined HADOOP_LIBEXEC_DIR (
-- set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
--)
--
--call %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd %*
--if "%1" == "--config" (
-- shift
-- shift
--)
--
--@rem stop hdfs daemons if hdfs is present
--if exist %HADOOP_HDFS_HOME%\sbin\stop-dfs.cmd (
-- call %HADOOP_HDFS_HOME%\sbin\stop-dfs.cmd --config %HADOOP_CONF_DIR%
--)
--
--@rem stop yarn daemons if yarn is present
--if exist %HADOOP_YARN_HOME%\sbin\stop-yarn.cmd (
-- call %HADOOP_YARN_HOME%\sbin\stop-yarn.cmd --config %HADOOP_CONF_DIR%
--)
--
--endlocal
++@echo off
++@rem Licensed to the Apache Software Foundation (ASF) under one or more
++@rem contributor license agreements. See the NOTICE file distributed with
++@rem this work for additional information regarding copyright ownership.
++@rem The ASF licenses this file to You under the Apache License, Version 2.0
++@rem (the "License"); you may not use this file except in compliance with
++@rem the License. You may obtain a copy of the License at
++@rem
++@rem http://www.apache.org/licenses/LICENSE-2.0
++@rem
++@rem Unless required by applicable law or agreed to in writing, software
++@rem distributed under the License is distributed on an "AS IS" BASIS,
++@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++@rem See the License for the specific language governing permissions and
++@rem limitations under the License.
++
++setlocal enabledelayedexpansion
++
++@rem Stop all hadoop daemons. Run this on master node.
++
++echo This script is Deprecated. Instead use stop-dfs.cmd and stop-yarn.cmd
++
++if not defined HADOOP_BIN_PATH (
++ set HADOOP_BIN_PATH=%~dp0
++)
++
++if "%HADOOP_BIN_PATH:~-1%" == "\" (
++ set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
++)
++
++set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
++if not defined HADOOP_LIBEXEC_DIR (
++ set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
++)
++
++call %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd %*
++if "%1" == "--config" (
++ shift
++ shift
++)
++
++@rem stop hdfs daemons if hdfs is present
++if exist %HADOOP_HDFS_HOME%\sbin\stop-dfs.cmd (
++ call %HADOOP_HDFS_HOME%\sbin\stop-dfs.cmd --config %HADOOP_CONF_DIR%
++)
++
++@rem stop yarn daemons if yarn is present
++if exist %HADOOP_YARN_HOME%\sbin\stop-yarn.cmd (
++ call %HADOOP_YARN_HOME%\sbin\stop-yarn.cmd --config %HADOOP_CONF_DIR%
++)
++
++endlocal
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1363eff6/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.cmd
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.cmd
index f3aa733,f3aa733..581fd03
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.cmd
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.cmd
@@@ -1,43 -1,43 +1,43 @@@
--@echo off
--@rem Licensed to the Apache Software Foundation (ASF) under one or more
--@rem contributor license agreements. See the NOTICE file distributed with
--@rem this work for additional information regarding copyright ownership.
--@rem The ASF licenses this file to You under the Apache License, Version 2.0
--@rem (the "License"); you may not use this file except in compliance with
--@rem the License. You may obtain a copy of the License at
--@rem
--@rem http://www.apache.org/licenses/LICENSE-2.0
--@rem
--@rem Unless required by applicable law or agreed to in writing, software
--@rem distributed under the License is distributed on an "AS IS" BASIS,
--@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--@rem See the License for the specific language governing permissions and
--@rem limitations under the License.
--
--@rem included in all the hdfs scripts with source command
--@rem should not be executed directly
--
--if not defined HADOOP_BIN_PATH (
-- set HADOOP_BIN_PATH=%~dp0
--)
--
--if "%HADOOP_BIN_PATH:~-1%" == "\" (
-- set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
--)
--
--set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
--if not defined HADOOP_LIBEXEC_DIR (
-- set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
--)
--
--if exist %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd (
-- call %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd %*
--) else if exist %HADOOP_COMMON_HOME%\libexec\hadoop-config.cmd (
-- call %HADOOP_COMMON_HOME%\libexec\hadoop-config.cmd %*
--) else if exist %HADOOP_HOME%\libexec\hadoop-config.cmd (
-- call %HADOOP_HOME%\libexec\hadoop-config.cmd %*
--) else (
-- echo Hadoop common not found.
--)
--
--:eof
++@echo off
++@rem Licensed to the Apache Software Foundation (ASF) under one or more
++@rem contributor license agreements. See the NOTICE file distributed with
++@rem this work for additional information regarding copyright ownership.
++@rem The ASF licenses this file to You under the Apache License, Version 2.0
++@rem (the "License"); you may not use this file except in compliance with
++@rem the License. You may obtain a copy of the License at
++@rem
++@rem http://www.apache.org/licenses/LICENSE-2.0
++@rem
++@rem Unless required by applicable law or agreed to in writing, software
++@rem distributed under the License is distributed on an "AS IS" BASIS,
++@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++@rem See the License for the specific language governing permissions and
++@rem limitations under the License.
++
++@rem included in all the hdfs scripts with source command
++@rem should not be executed directly
++
++if not defined HADOOP_BIN_PATH (
++ set HADOOP_BIN_PATH=%~dp0
++)
++
++if "%HADOOP_BIN_PATH:~-1%" == "\" (
++ set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
++)
++
++set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
++if not defined HADOOP_LIBEXEC_DIR (
++ set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
++)
++
++if exist %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd (
++ call %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd %*
++) else if exist %HADOOP_COMMON_HOME%\libexec\hadoop-config.cmd (
++ call %HADOOP_COMMON_HOME%\libexec\hadoop-config.cmd %*
++) else if exist %HADOOP_HOME%\libexec\hadoop-config.cmd (
++ call %HADOOP_HOME%\libexec\hadoop-config.cmd %*
++) else (
++ echo Hadoop common not found.
++)
++
++:eof
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1363eff6/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.cmd
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.cmd
index 9f20e5a,9f20e5a..c88d049
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.cmd
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.cmd
@@@ -1,41 -1,41 +1,41 @@@
--@echo off
--@rem Licensed to the Apache Software Foundation (ASF) under one or more
--@rem contributor license agreements. See the NOTICE file distributed with
--@rem this work for additional information regarding copyright ownership.
--@rem The ASF licenses this file to You under the Apache License, Version 2.0
--@rem (the "License"); you may not use this file except in compliance with
--@rem the License. You may obtain a copy of the License at
--@rem
--@rem http://www.apache.org/licenses/LICENSE-2.0
--@rem
--@rem Unless required by applicable law or agreed to in writing, software
--@rem distributed under the License is distributed on an "AS IS" BASIS,
--@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--@rem See the License for the specific language governing permissions and
--@rem limitations under the License.
--@rem
--setlocal enabledelayedexpansion
--
--if not defined HADOOP_BIN_PATH (
-- set HADOOP_BIN_PATH=%~dp0
--)
--
--if "%HADOOP_BIN_PATH:~-1%" == "\" (
-- set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
--)
--
--set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
--if not defined HADOOP_LIBEXEC_DIR (
-- set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
--)
--
--call %HADOOP_LIBEXEC_DIR%\hdfs-config.cmd %*
--if "%1" == "--config" (
-- shift
-- shift
--)
--
--start "Apache Hadoop Distribution" hadoop namenode
--start "Apache Hadoop Distribution" hadoop datanode
--
--endlocal
++@echo off
++@rem Licensed to the Apache Software Foundation (ASF) under one or more
++@rem contributor license agreements. See the NOTICE file distributed with
++@rem this work for additional information regarding copyright ownership.
++@rem The ASF licenses this file to You under the Apache License, Version 2.0
++@rem (the "License"); you may not use this file except in compliance with
++@rem the License. You may obtain a copy of the License at
++@rem
++@rem http://www.apache.org/licenses/LICENSE-2.0
++@rem
++@rem Unless required by applicable law or agreed to in writing, software
++@rem distributed under the License is distributed on an "AS IS" BASIS,
++@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++@rem See the License for the specific language governing permissions and
++@rem limitations under the License.
++@rem
++setlocal enabledelayedexpansion
++
++if not defined HADOOP_BIN_PATH (
++ set HADOOP_BIN_PATH=%~dp0
++)
++
++if "%HADOOP_BIN_PATH:~-1%" == "\" (
++ set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
++)
++
++set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
++if not defined HADOOP_LIBEXEC_DIR (
++ set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
++)
++
++call %HADOOP_LIBEXEC_DIR%\hdfs-config.cmd %*
++if "%1" == "--config" (
++ shift
++ shift
++)
++
++start "Apache Hadoop Distribution" hadoop namenode
++start "Apache Hadoop Distribution" hadoop datanode
++
++endlocal
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1363eff6/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.cmd
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.cmd
index f0cf015,f0cf015..053c5dc
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.cmd
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.cmd
@@@ -1,41 -1,41 +1,41 @@@
--@echo off
--@rem Licensed to the Apache Software Foundation (ASF) under one or more
--@rem contributor license agreements. See the NOTICE file distributed with
--@rem this work for additional information regarding copyright ownership.
--@rem The ASF licenses this file to You under the Apache License, Version 2.0
--@rem (the "License"); you may not use this file except in compliance with
--@rem the License. You may obtain a copy of the License at
--@rem
--@rem http://www.apache.org/licenses/LICENSE-2.0
--@rem
--@rem Unless required by applicable law or agreed to in writing, software
--@rem distributed under the License is distributed on an "AS IS" BASIS,
--@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--@rem See the License for the specific language governing permissions and
--@rem limitations under the License.
--@rem
--setlocal enabledelayedexpansion
--
--if not defined HADOOP_BIN_PATH (
-- set HADOOP_BIN_PATH=%~dp0
--)
--
--if "%HADOOP_BIN_PATH:~-1%" == "\" (
-- set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
--)
--
--set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
--if not defined HADOOP_LIBEXEC_DIR (
-- set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
--)
--
--call %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd %*
--if "%1" == "--config" (
-- shift
-- shift
--)
--
--Taskkill /FI "WINDOWTITLE eq Apache Hadoop Distribution - hadoop namenode"
--Taskkill /FI "WINDOWTITLE eq Apache Hadoop Distribution - hadoop datanode"
--
--endlocal
++@echo off
++@rem Licensed to the Apache Software Foundation (ASF) under one or more
++@rem contributor license agreements. See the NOTICE file distributed with
++@rem this work for additional information regarding copyright ownership.
++@rem The ASF licenses this file to You under the Apache License, Version 2.0
++@rem (the "License"); you may not use this file except in compliance with
++@rem the License. You may obtain a copy of the License at
++@rem
++@rem http://www.apache.org/licenses/LICENSE-2.0
++@rem
++@rem Unless required by applicable law or agreed to in writing, software
++@rem distributed under the License is distributed on an "AS IS" BASIS,
++@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++@rem See the License for the specific language governing permissions and
++@rem limitations under the License.
++@rem
++setlocal enabledelayedexpansion
++
++if not defined HADOOP_BIN_PATH (
++ set HADOOP_BIN_PATH=%~dp0
++)
++
++if "%HADOOP_BIN_PATH:~-1%" == "\" (
++ set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
++)
++
++set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
++if not defined HADOOP_LIBEXEC_DIR (
++ set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
++)
++
++call %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd %*
++if "%1" == "--config" (
++ shift
++ shift
++)
++
++Taskkill /FI "WINDOWTITLE eq Apache Hadoop Distribution - hadoop namenode"
++Taskkill /FI "WINDOWTITLE eq Apache Hadoop Distribution - hadoop datanode"
++
++endlocal
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1363eff6/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSHighAvailabilityWithQJM.md
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSHighAvailabilityWithQJM.md
index 0d20091,e4363fb..76a9837
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSHighAvailabilityWithQJM.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSHighAvailabilityWithQJM.md
@@@ -423,34 -423,14 +423,42 @@@ This guide describes high-level uses o
**Note:** This is not yet implemented, and at present will always return
success, unless the given NameNode is completely down.
+
+ ### Load Balancer Setup
+
+ If you are running a set of NameNodes behind a Load Balancer (e.g. [Azure](https://docs.microsoft.com/en-us/azure/load-balancer/load-balancer-custom-probe-overview) or [AWS](https://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-healthchecks.html) ) and would like the Load Balancer to point to the active NN, you can use the /isActive HTTP endpoint as a health probe.
+ http://NN_HOSTNAME/isActive will return a 200 status code response if the NN is in Active HA State, 405 otherwise.
+
+
+
+### In-Progress Edit Log Tailing
+
+Under the default settings, the Standby NameNode will only apply edits that are present in an edit
+log segments which has been finalized. If it is desirable to have a Standby NameNode which has more
+up-to-date namespace information, it is possible to enable tailing of in-progress edit segments.
+This setting will attempt to fetch edits from an in-memory cache on the JournalNodes and can reduce
+the lag time before a transaction is applied on the Standby NameNode to the order of milliseconds.
+If an edit cannot be served from the cache, the Standby will still be able to retrieve it, but the
+lag time will be much longer. The relevant configurations are:
+
+* **dfs.ha.tail-edits.in-progress** - Whether or not to enable tailing on in-progress edits logs.
+ This will also enable the in-memory edit cache on the JournalNodes. Disabled by default.
+
+* **dfs.journalnode.edit-cache-size.bytes** - The size of the in-memory cache of edits on the
+ JournalNode. Edits take around 200 bytes each in a typical environment, so, for example, the
+ default of 1048576 (1MB) can hold around 5000 transactions. It is recommended to monitor the
+ JournalNode metrics RpcRequestCacheMissAmountNumMisses and RpcRequestCacheMissAmountAvgTxns,
+ which respectively count the number of requests unable to be served by the cache, and the extra
+ number of transactions which would have needed to have been in the cache for the request to
+ succeed. For example, if a request attempted to fetch edits starting at transaction ID 10, but
+ the oldest data in the cache was at transaction ID 20, a value of 10 would be added to the
+ average.
+
+This feature is primarily useful in conjunction with the Standby/Observer Read feature. Using this
+feature, read requests can be serviced from non-active NameNodes; thus tailing in-progress edits
+provides these nodes with the ability to serve requests with data which is much more fresh. See the
+Apache JIRA ticket HDFS-12943 for more information on this feature.
+
Automatic Failover
------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1363eff6/hadoop-mapreduce-project/bin/mapred-config.cmd
----------------------------------------------------------------------
diff --cc hadoop-mapreduce-project/bin/mapred-config.cmd
index f3aa733,f3aa733..581fd03
--- a/hadoop-mapreduce-project/bin/mapred-config.cmd
+++ b/hadoop-mapreduce-project/bin/mapred-config.cmd
@@@ -1,43 -1,43 +1,43 @@@
--@echo off
--@rem Licensed to the Apache Software Foundation (ASF) under one or more
--@rem contributor license agreements. See the NOTICE file distributed with
--@rem this work for additional information regarding copyright ownership.
--@rem The ASF licenses this file to You under the Apache License, Version 2.0
--@rem (the "License"); you may not use this file except in compliance with
--@rem the License. You may obtain a copy of the License at
--@rem
--@rem http://www.apache.org/licenses/LICENSE-2.0
--@rem
--@rem Unless required by applicable law or agreed to in writing, software
--@rem distributed under the License is distributed on an "AS IS" BASIS,
--@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--@rem See the License for the specific language governing permissions and
--@rem limitations under the License.
--
--@rem included in all the hdfs scripts with source command
--@rem should not be executed directly
--
--if not defined HADOOP_BIN_PATH (
-- set HADOOP_BIN_PATH=%~dp0
--)
--
--if "%HADOOP_BIN_PATH:~-1%" == "\" (
-- set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
--)
--
--set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
--if not defined HADOOP_LIBEXEC_DIR (
-- set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
--)
--
--if exist %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd (
-- call %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd %*
--) else if exist %HADOOP_COMMON_HOME%\libexec\hadoop-config.cmd (
-- call %HADOOP_COMMON_HOME%\libexec\hadoop-config.cmd %*
--) else if exist %HADOOP_HOME%\libexec\hadoop-config.cmd (
-- call %HADOOP_HOME%\libexec\hadoop-config.cmd %*
--) else (
-- echo Hadoop common not found.
--)
--
--:eof
++@echo off
++@rem Licensed to the Apache Software Foundation (ASF) under one or more
++@rem contributor license agreements. See the NOTICE file distributed with
++@rem this work for additional information regarding copyright ownership.
++@rem The ASF licenses this file to You under the Apache License, Version 2.0
++@rem (the "License"); you may not use this file except in compliance with
++@rem the License. You may obtain a copy of the License at
++@rem
++@rem http://www.apache.org/licenses/LICENSE-2.0
++@rem
++@rem Unless required by applicable law or agreed to in writing, software
++@rem distributed under the License is distributed on an "AS IS" BASIS,
++@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++@rem See the License for the specific language governing permissions and
++@rem limitations under the License.
++
++@rem included in all the hdfs scripts with source command
++@rem should not be executed directly
++
++if not defined HADOOP_BIN_PATH (
++ set HADOOP_BIN_PATH=%~dp0
++)
++
++if "%HADOOP_BIN_PATH:~-1%" == "\" (
++ set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
++)
++
++set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
++if not defined HADOOP_LIBEXEC_DIR (
++ set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
++)
++
++if exist %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd (
++ call %HADOOP_LIBEXEC_DIR%\hadoop-config.cmd %*
++) else if exist %HADOOP_COMMON_HOME%\libexec\hadoop-config.cmd (
++ call %HADOOP_COMMON_HOME%\libexec\hadoop-config.cmd %*
++) else if exist %HADOOP_HOME%\libexec\hadoop-config.cmd (
++ call %HADOOP_HOME%\libexec\hadoop-config.cmd %*
++) else (
++ echo Hadoop common not found.
++)
++
++:eof
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1363eff6/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
----------------------------------------------------------------------
diff --cc hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
index 4b38e3e,4b38e3e..d6ab883
--- a/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
+++ b/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
@@@ -1,18 -1,18 +1,18 @@@
--@rem Licensed to the Apache Software Foundation (ASF) under one
--@rem or more contributor license agreements. See the NOTICE file
--@rem distributed with this work for additional information
--@rem regarding copyright ownership. The ASF licenses this file
--@rem to you under the Apache License, Version 2.0 (the
--@rem "License"); you may not use this file except in compliance
--@rem with the License. You may obtain a copy of the License at
--@rem
--@rem http://www.apache.org/licenses/LICENSE-2.0
--@rem
--@rem Unless required by applicable law or agreed to in writing, software
--@rem distributed under the License is distributed on an "AS IS" BASIS,
--@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--@rem See the License for the specific language governing permissions and
--@rem limitations under the License.
--
--@for /F "usebackq tokens=* delims=" %%A in (`findstr .`) do @echo %%A
--@rem lines have been copied from stdin to stdout
++@rem Licensed to the Apache Software Foundation (ASF) under one
++@rem or more contributor license agreements. See the NOTICE file
++@rem distributed with this work for additional information
++@rem regarding copyright ownership. The ASF licenses this file
++@rem to you under the Apache License, Version 2.0 (the
++@rem "License"); you may not use this file except in compliance
++@rem with the License. You may obtain a copy of the License at
++@rem
++@rem http://www.apache.org/licenses/LICENSE-2.0
++@rem
++@rem Unless required by applicable law or agreed to in writing, software
++@rem distributed under the License is distributed on an "AS IS" BASIS,
++@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++@rem See the License for the specific language governing permissions and
++@rem limitations under the License.
++
++@for /F "usebackq tokens=* delims=" %%A in (`findstr .`) do @echo %%A
++@rem lines have been copied from stdin to stdout
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1363eff6/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
----------------------------------------------------------------------
diff --cc hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
index f398a8d,f398a8d..91f92b6
--- a/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
+++ b/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
@@@ -1,18 -1,18 +1,18 @@@
--@rem Licensed to the Apache Software Foundation (ASF) under one
--@rem or more contributor license agreements. See the NOTICE file
--@rem distributed with this work for additional information
--@rem regarding copyright ownership. The ASF licenses this file
--@rem to you under the Apache License, Version 2.0 (the
--@rem "License"); you may not use this file except in compliance
--@rem with the License. You may obtain a copy of the License at
--@rem
--@rem http://www.apache.org/licenses/LICENSE-2.0
--@rem
--@rem Unless required by applicable law or agreed to in writing, software
--@rem distributed under the License is distributed on an "AS IS" BASIS,
--@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--@rem See the License for the specific language governing permissions and
--@rem limitations under the License.
--
--@for /F "usebackq tokens=* delims=" %%A in (`findstr .`) do @type %%A
--@rem files named on stdin have been copied to stdout
++@rem Licensed to the Apache Software Foundation (ASF) under one
++@rem or more contributor license agreements. See the NOTICE file
++@rem distributed with this work for additional information
++@rem regarding copyright ownership. The ASF licenses this file
++@rem to you under the Apache License, Version 2.0 (the
++@rem "License"); you may not use this file except in compliance
++@rem with the License. You may obtain a copy of the License at
++@rem
++@rem http://www.apache.org/licenses/LICENSE-2.0
++@rem
++@rem Unless required by applicable law or agreed to in writing, software
++@rem distributed under the License is distributed on an "AS IS" BASIS,
++@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++@rem See the License for the specific language governing permissions and
++@rem limitations under the License.
++
++@for /F "usebackq tokens=* delims=" %%A in (`findstr .`) do @type %%A
++@rem files named on stdin have been copied to stdout
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1363eff6/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.cmd
----------------------------------------------------------------------
diff --cc hadoop-yarn-project/hadoop-yarn/bin/start-yarn.cmd
index 989510b,989510b..6009491
--- a/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.cmd
+++ b/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.cmd
@@@ -1,47 -1,47 +1,47 @@@
--@echo off
--@rem Licensed to the Apache Software Foundation (ASF) under one or more
--@rem contributor license agreements. See the NOTICE file distributed with
--@rem this work for additional information regarding copyright ownership.
--@rem The ASF licenses this file to You under the Apache License, Version 2.0
--@rem (the "License"); you may not use this file except in compliance with
--@rem the License. You may obtain a copy of the License at
--@rem
--@rem http://www.apache.org/licenses/LICENSE-2.0
--@rem
--@rem Unless required by applicable law or agreed to in writing, software
--@rem distributed under the License is distributed on an "AS IS" BASIS,
--@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--@rem See the License for the specific language governing permissions and
--@rem limitations under the License.
--@rem
--setlocal enabledelayedexpansion
--
--echo starting yarn daemons
--
--if not defined HADOOP_BIN_PATH (
-- set HADOOP_BIN_PATH=%~dp0
--)
--
--if "%HADOOP_BIN_PATH:~-1%" == "\" (
-- set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
--)
--
--set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
--if not defined HADOOP_LIBEXEC_DIR (
-- set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
--)
--
--call %HADOOP_LIBEXEC_DIR%\yarn-config.cmd %*
--if "%1" == "--config" (
-- shift
-- shift
--)
--
--@rem start resourceManager
--start "Apache Hadoop Distribution" yarn resourcemanager
--@rem start nodeManager
--start "Apache Hadoop Distribution" yarn nodemanager
--@rem start proxyserver
--@rem start "Apache Hadoop Distribution" yarn proxyserver
--
--endlocal
++@echo off
++@rem Licensed to the Apache Software Foundation (ASF) under one or more
++@rem contributor license agreements. See the NOTICE file distributed with
++@rem this work for additional information regarding copyright ownership.
++@rem The ASF licenses this file to You under the Apache License, Version 2.0
++@rem (the "License"); you may not use this file except in compliance with
++@rem the License. You may obtain a copy of the License at
++@rem
++@rem http://www.apache.org/licenses/LICENSE-2.0
++@rem
++@rem Unless required by applicable law or agreed to in writing, software
++@rem distributed under the License is distributed on an "AS IS" BASIS,
++@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++@rem See the License for the specific language governing permissions and
++@rem limitations under the License.
++@rem
++setlocal enabledelayedexpansion
++
++echo starting yarn daemons
++
++if not defined HADOOP_BIN_PATH (
++ set HADOOP_BIN_PATH=%~dp0
++)
++
++if "%HADOOP_BIN_PATH:~-1%" == "\" (
++ set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
++)
++
++set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
++if not defined HADOOP_LIBEXEC_DIR (
++ set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
++)
++
++call %HADOOP_LIBEXEC_DIR%\yarn-config.cmd %*
++if "%1" == "--config" (
++ shift
++ shift
++)
++
++@rem start resourceManager
++start "Apache Hadoop Distribution" yarn resourcemanager
++@rem start nodeManager
++start "Apache Hadoop Distribution" yarn nodemanager
++@rem start proxyserver
++@rem start "Apache Hadoop Distribution" yarn proxyserver
++
++endlocal
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1363eff6/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.cmd
----------------------------------------------------------------------
diff --cc hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.cmd
index 0914337,0914337..eedccff
--- a/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.cmd
+++ b/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.cmd
@@@ -1,47 -1,47 +1,47 @@@
--@echo off
--@rem Licensed to the Apache Software Foundation (ASF) under one or more
--@rem contributor license agreements. See the NOTICE file distributed with
--@rem this work for additional information regarding copyright ownership.
--@rem The ASF licenses this file to You under the Apache License, Version 2.0
--@rem (the "License"); you may not use this file except in compliance with
--@rem the License. You may obtain a copy of the License at
--@rem
--@rem http://www.apache.org/licenses/LICENSE-2.0
--@rem
--@rem Unless required by applicable law or agreed to in writing, software
--@rem distributed under the License is distributed on an "AS IS" BASIS,
--@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--@rem See the License for the specific language governing permissions and
--@rem limitations under the License.
--@rem
--setlocal enabledelayedexpansion
--
--echo stopping yarn daemons
--
--if not defined HADOOP_BIN_PATH (
-- set HADOOP_BIN_PATH=%~dp0
--)
--
--if "%HADOOP_BIN_PATH:~-1%" == "\" (
-- set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
--)
--
--set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
--if not defined HADOOP_LIBEXEC_DIR (
-- set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
--)
--
--call %HADOOP_LIBEXEC_DIR%\yarn-config.cmd %*
--if "%1" == "--config" (
-- shift
-- shift
--)
--
--@rem stop resourceManager
--Taskkill /FI "WINDOWTITLE eq Apache Hadoop Distribution - yarn resourcemanager"
--@rem stop nodeManager
--Taskkill /FI "WINDOWTITLE eq Apache Hadoop Distribution - yarn nodemanager"
--@rem stop proxy server
--Taskkill /FI "WINDOWTITLE eq Apache Hadoop Distribution - yarn proxyserver"
--
--endlocal
++@echo off
++@rem Licensed to the Apache Software Foundation (ASF) under one or more
++@rem contributor license agreements. See the NOTICE file distributed with
++@rem this work for additional information regarding copyright ownership.
++@rem The ASF licenses this file to You under the Apache License, Version 2.0
++@rem (the "License"); you may not use this file except in compliance with
++@rem the License. You may obtain a copy of the License at
++@rem
++@rem http://www.apache.org/licenses/LICENSE-2.0
++@rem
++@rem Unless required by applicable law or agreed to in writing, software
++@rem distributed under the License is distributed on an "AS IS" BASIS,
++@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++@rem See the License for the specific language governing permissions and
++@rem limitations under the License.
++@rem
++setlocal enabledelayedexpansion
++
++echo stopping yarn daemons
++
++if not defined HADOOP_BIN_PATH (
++ set HADOOP_BIN_PATH=%~dp0
++)
++
++if "%HADOOP_BIN_PATH:~-1%" == "\" (
++ set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
++)
++
++set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
++if not defined HADOOP_LIBEXEC_DIR (
++ set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
++)
++
++call %HADOOP_LIBEXEC_DIR%\yarn-config.cmd %*
++if "%1" == "--config" (
++ shift
++ shift
++)
++
++@rem stop resourceManager
++Taskkill /FI "WINDOWTITLE eq Apache Hadoop Distribution - yarn resourcemanager"
++@rem stop nodeManager
++Taskkill /FI "WINDOWTITLE eq Apache Hadoop Distribution - yarn nodemanager"
++@rem stop proxy server
++Taskkill /FI "WINDOWTITLE eq Apache Hadoop Distribution - yarn proxyserver"
++
++endlocal
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org