Return-Path: X-Original-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0D3B5104A0 for ; Mon, 14 Oct 2013 17:07:18 +0000 (UTC) Received: (qmail 16842 invoked by uid 500); 14 Oct 2013 17:07:15 -0000 Delivered-To: apmail-hadoop-yarn-commits-archive@hadoop.apache.org Received: (qmail 16802 invoked by uid 500); 14 Oct 2013 17:07:15 -0000 Mailing-List: contact yarn-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: yarn-commits@hadoop.apache.org Delivered-To: mailing list yarn-commits@hadoop.apache.org Received: (qmail 16777 invoked by uid 99); 14 Oct 2013 17:07:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Oct 2013 17:07:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Oct 2013 17:07:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 511DA2388A33; Mon, 14 Oct 2013 17:06:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1531978 - in /hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn: bin/start-yarn.cmd bin/stop-yarn.cmd bin/yarn-config.cmd bin/yarn.cmd conf/yarn-env.cmd Date: Mon, 14 Oct 2013 17:06:44 -0000 To: yarn-commits@hadoop.apache.org From: cnauroth@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131014170644.511DA2388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cnauroth Date: Mon Oct 14 17:06:42 2013 New Revision: 1531978 URL: http://svn.apache.org/r1531978 Log: HADOOP-10040. Merging change r1531977 from trunk to branch-2. Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.cmd (contents, props changed) hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.cmd (contents, props changed) hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn-config.cmd (contents, props changed) hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd (contents, props changed) hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.cmd (contents, props changed) Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.cmd?rev=1531978&r1=1531977&r2=1531978&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.cmd (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.cmd Mon Oct 14 17:06:42 2013 @@ -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 Propchange: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.cmd ('svn:eol-style' removed) Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.cmd?rev=1531978&r1=1531977&r2=1531978&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.cmd (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.cmd Mon Oct 14 17:06:42 2013 @@ -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 Propchange: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.cmd ('svn:eol-style' removed) Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn-config.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn-config.cmd?rev=1531978&r1=1531977&r2=1531978&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn-config.cmd (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn-config.cmd Mon Oct 14 17:06:42 2013 @@ -1,72 +1,72 @@ -@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. -) - -@rem -@rem Allow alternate conf dir location. -@rem - -if "%1" == "--config" ( - shift - set YARN_CONF_DIR=%2 - shift -) - -if not defined YARN_CONF_DIR ( - if not defined HADOOP_CONF_DIR ( - set YARN_CONF_DIR=%HADOOP_YARN_HOME%\conf - ) else ( - set YARN_CONF_DIR=%HADOOP_CONF_DIR% - ) -) - -@rem -@rem check to see it is specified whether to use the slaves or the -@rem masters file -@rem - -if "%1" == "--hosts" ( - set YARN_SLAVES=%YARN_CONF_DIR%\%2 - shift - shift -) - -: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. +) + +@rem +@rem Allow alternate conf dir location. +@rem + +if "%1" == "--config" ( + shift + set YARN_CONF_DIR=%2 + shift +) + +if not defined YARN_CONF_DIR ( + if not defined HADOOP_CONF_DIR ( + set YARN_CONF_DIR=%HADOOP_YARN_HOME%\conf + ) else ( + set YARN_CONF_DIR=%HADOOP_CONF_DIR% + ) +) + +@rem +@rem check to see it is specified whether to use the slaves or the +@rem masters file +@rem + +if "%1" == "--hosts" ( + set YARN_SLAVES=%YARN_CONF_DIR%\%2 + shift + shift +) + +:eof Propchange: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn-config.cmd ('svn:eol-style' removed) Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd?rev=1531978&r1=1531977&r2=1531978&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd Mon Oct 14 17:06:42 2013 @@ -1,254 +1,254 @@ -@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 The Hadoop command script -@rem -@rem Environment Variables -@rem -@rem JAVA_HOME The java implementation to use. Overrides JAVA_HOME. -@rem -@rem YARN_CLASSPATH Extra Java CLASSPATH entries. -@rem -@rem YARN_HEAPSIZE The maximum amount of heap to use, in MB. -@rem Default is 1000. -@rem -@rem YARN_{COMMAND}_HEAPSIZE overrides YARN_HEAPSIZE for a given command -@rem eg YARN_NODEMANAGER_HEAPSIZE sets the heap -@rem size for the NodeManager. If you set the -@rem heap size in YARN_{COMMAND}_OPTS or YARN_OPTS -@rem they take precedence. -@rem -@rem YARN_OPTS Extra Java runtime options. -@rem -@rem YARN_CLIENT_OPTS when the respective command is run. -@rem YARN_{COMMAND}_OPTS etc YARN_NODEMANAGER_OPTS applies to NodeManager -@rem for e.g. YARN_CLIENT_OPTS applies to -@rem more than one command (fs, dfs, fsck, -@rem dfsadmin etc) -@rem -@rem YARN_CONF_DIR Alternate conf dir. Default is ${HADOOP_YARN_HOME}/conf. -@rem -@rem YARN_ROOT_LOGGER The root appender. Default is INFO,console -@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 %DEFAULT_LIBEXEC_DIR%\yarn-config.cmd %* -if "%1" == "--config" ( - shift - shift -) - -:main - if exist %YARN_CONF_DIR%\yarn-env.cmd ( - call %YARN_CONF_DIR%\yarn-env.cmd - ) - - set yarn-command=%1 - call :make_command_arguments %* - - if not defined yarn-command ( - goto print_usage - ) - - @rem JAVA and JAVA_HEAP_MAX and set in hadoop-config.cmd - - if defined YARN_HEAPSIZE ( - @rem echo run with Java heapsize %YARN_HEAPSIZE% - set JAVA_HEAP_MAX=-Xmx%YARN_HEAPSIZE%m - ) - - @rem CLASSPATH initially contains HADOOP_CONF_DIR & YARN_CONF_DIR - if not defined HADOOP_CONF_DIR ( - echo No HADOOP_CONF_DIR set. - echo Please specify it either in yarn-env.cmd or in the environment. - goto :eof - ) - - set CLASSPATH=%HADOOP_CONF_DIR%;%YARN_CONF_DIR%;%CLASSPATH% - - @rem for developers, add Hadoop classes to CLASSPATH - if exist %HADOOP_YARN_HOME%\yarn-api\target\classes ( - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-api\target\classes - ) - - if exist %HADOOP_YARN_HOME%\yarn-common\target\classes ( - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-common\target\classes - ) - - if exist %HADOOP_YARN_HOME%\yarn-mapreduce\target\classes ( - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-mapreduce\target\classes - ) - - if exist %HADOOP_YARN_HOME%\yarn-master-worker\target\classes ( - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-master-worker\target\classes - ) - - if exist %HADOOP_YARN_HOME%\yarn-server\yarn-server-nodemanager\target\classes ( - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-server\yarn-server-nodemanager\target\classes - ) - - if exist %HADOOP_YARN_HOME%\yarn-server\yarn-server-common\target\classes ( - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-server\yarn-server-common\target\classes - ) - - if exist %HADOOP_YARN_HOME%\yarn-server\yarn-server-resourcemanager\target\classes ( - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-server\yarn-server-resourcemanager\target\classes - ) - - if exist %HADOOP_YARN_HOME%\build\test\classes ( - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\build\test\classes - ) - - if exist %HADOOP_YARN_HOME%\build\tools ( - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\build\tools - ) - - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_DIR%\* - set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_LIB_JARS_DIR%\* - - call :%yarn-command% %yarn-command-arguments% - - if defined JAVA_LIBRARY_PATH ( - set YARN_OPTS=%YARN_OPTS% -Djava.library.path=%JAVA_LIBRARY_PATH% - ) - - set java_arguments=%JAVA_HEAP_MAX% %YARN_OPTS% -classpath %CLASSPATH% %CLASS% %yarn-command-arguments% - call %JAVA% %java_arguments% - -goto :eof - -:classpath - @echo %CLASSPATH% - goto :eof - -:rmadmin - set CLASS=org.apache.hadoop.yarn.server.resourcemanager.tools.RMAdmin - set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% - goto :eof - -:application - set CLASS=org.apache.hadoop.yarn.client.cli.ApplicationCLI - set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% - goto :eof - -:node - set CLASS=org.apache.hadoop.yarn.client.cli.NodeCLI - set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% - goto :eof - -:resourcemanager - set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\rm-config\log4j.properties - set CLASS=org.apache.hadoop.yarn.server.resourcemanager.ResourceManager - set YARN_OPTS=%YARN_OPTS% %HADOOP_RESOURCEMANAGER_OPTS% - if defined YARN_RESOURCEMANAGER_HEAPSIZE ( - set JAVA_HEAP_MAX=-Xmx%YARN_RESOURCEMANAGER_HEAPSIZE%m - ) - goto :eof - -:nodemanager - set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\nm-config\log4j.properties - set CLASS=org.apache.hadoop.yarn.server.nodemanager.NodeManager - set YARN_OPTS=%YARN_OPTS% -server %HADOOP_NODEMANAGER_OPTS% - if defined YARN_NODEMANAGER_HEAPSIZE ( - set JAVA_HEAP_MAX=-Xmx%YARN_NODEMANAGER_HEAPSIZE%m - ) - goto :eof - -:proxyserver - set CLASS=org.apache.hadoop.yarn.server.webproxy.WebAppProxyServer - set YARN_OPTS=%YARN_OPTS% %HADOOP_PROXYSERVER_OPTS% - if defined YARN_PROXYSERVER_HEAPSIZE ( - set JAVA_HEAP_MAX=-Xmx%YARN_PROXYSERVER_HEAPSIZE%m - ) - goto :eof - -:version - set CLASS=org.apache.hadoop.util.VersionInfo - set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% - goto :eof - -:jar - set CLASS=org.apache.hadoop.util.RunJar - set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% - goto :eof - -:logs - set CLASS=org.apache.hadoop.yarn.logaggregation.LogDumper - set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% - goto :eof - -:daemonlog - set CLASS=org.apache.hadoop.log.LogLevel - set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% - goto :eof - -@rem This changes %1, %2 etc. Hence those cannot be used after calling this. -:make_command_arguments - if "%1" == "--config" ( - shift - shift - ) - if [%2] == [] goto :eof - shift - set _yarnarguments= - :MakeCmdArgsLoop - if [%1]==[] goto :EndLoop - - if not defined _yarnarguments ( - set _yarnarguments=%1 - ) else ( - set _yarnarguments=!_yarnarguments! %1 - ) - shift - goto :MakeCmdArgsLoop - :EndLoop - set yarn-command-arguments=%_yarnarguments% - goto :eof - -:print_usage - @echo Usage: yarn [--config confdir] COMMAND - @echo where COMMAND is one of: - @echo resourcemanager run the ResourceManager - @echo nodemanager run a nodemanager on each slave - @echo historyserver run job history servers as a standalone daemon - @echo rmadmin admin tools - @echo version print the version - @echo jar ^ run a jar file - @echo application prints application(s) report/kill application - @echo node prints node report(s) - @echo logs dump container logs - @echo classpath prints the class path needed to get the - @echo Hadoop jar and the required libraries - @echo daemonlog get/set the log level for each daemon - @echo or - @echo CLASSNAME run the class named CLASSNAME - @echo Most commands print help when invoked w/o parameters. - -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 The Hadoop command script +@rem +@rem Environment Variables +@rem +@rem JAVA_HOME The java implementation to use. Overrides JAVA_HOME. +@rem +@rem YARN_CLASSPATH Extra Java CLASSPATH entries. +@rem +@rem YARN_HEAPSIZE The maximum amount of heap to use, in MB. +@rem Default is 1000. +@rem +@rem YARN_{COMMAND}_HEAPSIZE overrides YARN_HEAPSIZE for a given command +@rem eg YARN_NODEMANAGER_HEAPSIZE sets the heap +@rem size for the NodeManager. If you set the +@rem heap size in YARN_{COMMAND}_OPTS or YARN_OPTS +@rem they take precedence. +@rem +@rem YARN_OPTS Extra Java runtime options. +@rem +@rem YARN_CLIENT_OPTS when the respective command is run. +@rem YARN_{COMMAND}_OPTS etc YARN_NODEMANAGER_OPTS applies to NodeManager +@rem for e.g. YARN_CLIENT_OPTS applies to +@rem more than one command (fs, dfs, fsck, +@rem dfsadmin etc) +@rem +@rem YARN_CONF_DIR Alternate conf dir. Default is ${HADOOP_YARN_HOME}/conf. +@rem +@rem YARN_ROOT_LOGGER The root appender. Default is INFO,console +@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 %DEFAULT_LIBEXEC_DIR%\yarn-config.cmd %* +if "%1" == "--config" ( + shift + shift +) + +:main + if exist %YARN_CONF_DIR%\yarn-env.cmd ( + call %YARN_CONF_DIR%\yarn-env.cmd + ) + + set yarn-command=%1 + call :make_command_arguments %* + + if not defined yarn-command ( + goto print_usage + ) + + @rem JAVA and JAVA_HEAP_MAX and set in hadoop-config.cmd + + if defined YARN_HEAPSIZE ( + @rem echo run with Java heapsize %YARN_HEAPSIZE% + set JAVA_HEAP_MAX=-Xmx%YARN_HEAPSIZE%m + ) + + @rem CLASSPATH initially contains HADOOP_CONF_DIR & YARN_CONF_DIR + if not defined HADOOP_CONF_DIR ( + echo No HADOOP_CONF_DIR set. + echo Please specify it either in yarn-env.cmd or in the environment. + goto :eof + ) + + set CLASSPATH=%HADOOP_CONF_DIR%;%YARN_CONF_DIR%;%CLASSPATH% + + @rem for developers, add Hadoop classes to CLASSPATH + if exist %HADOOP_YARN_HOME%\yarn-api\target\classes ( + set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-api\target\classes + ) + + if exist %HADOOP_YARN_HOME%\yarn-common\target\classes ( + set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-common\target\classes + ) + + if exist %HADOOP_YARN_HOME%\yarn-mapreduce\target\classes ( + set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-mapreduce\target\classes + ) + + if exist %HADOOP_YARN_HOME%\yarn-master-worker\target\classes ( + set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-master-worker\target\classes + ) + + if exist %HADOOP_YARN_HOME%\yarn-server\yarn-server-nodemanager\target\classes ( + set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-server\yarn-server-nodemanager\target\classes + ) + + if exist %HADOOP_YARN_HOME%\yarn-server\yarn-server-common\target\classes ( + set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-server\yarn-server-common\target\classes + ) + + if exist %HADOOP_YARN_HOME%\yarn-server\yarn-server-resourcemanager\target\classes ( + set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-server\yarn-server-resourcemanager\target\classes + ) + + if exist %HADOOP_YARN_HOME%\build\test\classes ( + set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\build\test\classes + ) + + if exist %HADOOP_YARN_HOME%\build\tools ( + set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\build\tools + ) + + set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_DIR%\* + set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_LIB_JARS_DIR%\* + + call :%yarn-command% %yarn-command-arguments% + + if defined JAVA_LIBRARY_PATH ( + set YARN_OPTS=%YARN_OPTS% -Djava.library.path=%JAVA_LIBRARY_PATH% + ) + + set java_arguments=%JAVA_HEAP_MAX% %YARN_OPTS% -classpath %CLASSPATH% %CLASS% %yarn-command-arguments% + call %JAVA% %java_arguments% + +goto :eof + +:classpath + @echo %CLASSPATH% + goto :eof + +:rmadmin + set CLASS=org.apache.hadoop.yarn.server.resourcemanager.tools.RMAdmin + set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% + goto :eof + +:application + set CLASS=org.apache.hadoop.yarn.client.cli.ApplicationCLI + set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% + goto :eof + +:node + set CLASS=org.apache.hadoop.yarn.client.cli.NodeCLI + set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% + goto :eof + +:resourcemanager + set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\rm-config\log4j.properties + set CLASS=org.apache.hadoop.yarn.server.resourcemanager.ResourceManager + set YARN_OPTS=%YARN_OPTS% %HADOOP_RESOURCEMANAGER_OPTS% + if defined YARN_RESOURCEMANAGER_HEAPSIZE ( + set JAVA_HEAP_MAX=-Xmx%YARN_RESOURCEMANAGER_HEAPSIZE%m + ) + goto :eof + +:nodemanager + set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\nm-config\log4j.properties + set CLASS=org.apache.hadoop.yarn.server.nodemanager.NodeManager + set YARN_OPTS=%YARN_OPTS% -server %HADOOP_NODEMANAGER_OPTS% + if defined YARN_NODEMANAGER_HEAPSIZE ( + set JAVA_HEAP_MAX=-Xmx%YARN_NODEMANAGER_HEAPSIZE%m + ) + goto :eof + +:proxyserver + set CLASS=org.apache.hadoop.yarn.server.webproxy.WebAppProxyServer + set YARN_OPTS=%YARN_OPTS% %HADOOP_PROXYSERVER_OPTS% + if defined YARN_PROXYSERVER_HEAPSIZE ( + set JAVA_HEAP_MAX=-Xmx%YARN_PROXYSERVER_HEAPSIZE%m + ) + goto :eof + +:version + set CLASS=org.apache.hadoop.util.VersionInfo + set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% + goto :eof + +:jar + set CLASS=org.apache.hadoop.util.RunJar + set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% + goto :eof + +:logs + set CLASS=org.apache.hadoop.yarn.logaggregation.LogDumper + set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% + goto :eof + +:daemonlog + set CLASS=org.apache.hadoop.log.LogLevel + set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% + goto :eof + +@rem This changes %1, %2 etc. Hence those cannot be used after calling this. +:make_command_arguments + if "%1" == "--config" ( + shift + shift + ) + if [%2] == [] goto :eof + shift + set _yarnarguments= + :MakeCmdArgsLoop + if [%1]==[] goto :EndLoop + + if not defined _yarnarguments ( + set _yarnarguments=%1 + ) else ( + set _yarnarguments=!_yarnarguments! %1 + ) + shift + goto :MakeCmdArgsLoop + :EndLoop + set yarn-command-arguments=%_yarnarguments% + goto :eof + +:print_usage + @echo Usage: yarn [--config confdir] COMMAND + @echo where COMMAND is one of: + @echo resourcemanager run the ResourceManager + @echo nodemanager run a nodemanager on each slave + @echo historyserver run job history servers as a standalone daemon + @echo rmadmin admin tools + @echo version print the version + @echo jar ^ run a jar file + @echo application prints application(s) report/kill application + @echo node prints node report(s) + @echo logs dump container logs + @echo classpath prints the class path needed to get the + @echo Hadoop jar and the required libraries + @echo daemonlog get/set the log level for each daemon + @echo or + @echo CLASSNAME run the class named CLASSNAME + @echo Most commands print help when invoked w/o parameters. + +endlocal Propchange: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd ('svn:eol-style' removed) Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.cmd?rev=1531978&r1=1531977&r2=1531978&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.cmd (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.cmd Mon Oct 14 17:06:42 2013 @@ -1,60 +1,60 @@ -@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 User for YARN daemons -if not defined HADOOP_YARN_USER ( - set HADOOP_YARN_USER=%yarn% -) - -if not defined YARN_CONF_DIR ( - set YARN_CONF_DIR=%HADOOP_YARN_HOME%\conf -) - -if defined YARN_HEAPSIZE ( - @rem echo run with Java heapsize %YARN_HEAPSIZE% - set JAVA_HEAP_MAX=-Xmx%YARN_HEAPSIZE%m -) - -if not defined YARN_LOG_DIR ( - set YARN_LOG_DIR=%HADOOP_YARN_HOME%\logs -) - -if not defined YARN_LOGFILE ( - set YARN_LOGFILE=yarn.log -) - -@rem default policy file for service-level authorization -if not defined YARN_POLICYFILE ( - set YARN_POLICYFILE=hadoop-policy.xml -) - -if not defined YARN_ROOT_LOGGER ( - set YARN_ROOT_LOGGER=INFO,console -) - -set YARN_OPTS=%YARN_OPTS% -Dhadoop.log.dir=%YARN_LOG_DIR% -set YARN_OPTS=%YARN_OPTS% -Dyarn.log.dir=%YARN_LOG_DIR% -set YARN_OPTS=%YARN_OPTS% -Dhadoop.log.file=%YARN_LOGFILE% -set YARN_OPTS=%YARN_OPTS% -Dyarn.log.file=%YARN_LOGFILE% -set YARN_OPTS=%YARN_OPTS% -Dyarn.home.dir=%HADOOP_YARN_HOME% -set YARN_OPTS=%YARN_OPTS% -Dyarn.id.str=%YARN_IDENT_STRING% -set YARN_OPTS=%YARN_OPTS% -Dhadoop.home.dir=%HADOOP_YARN_HOME% -set YARN_OPTS=%YARN_OPTS% -Dhadoop.root.logger=%YARN_ROOT_LOGGER% -set YARN_OPTS=%YARN_OPTS% -Dyarn.root.logger=%YARN_ROOT_LOGGER% -if defined JAVA_LIBRARY_PATH ( - set YARN_OPTS=%YARN_OPTS% -Djava.library.path=%JAVA_LIBRARY_PATH% -) +@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 User for YARN daemons +if not defined HADOOP_YARN_USER ( + set HADOOP_YARN_USER=%yarn% +) + +if not defined YARN_CONF_DIR ( + set YARN_CONF_DIR=%HADOOP_YARN_HOME%\conf +) + +if defined YARN_HEAPSIZE ( + @rem echo run with Java heapsize %YARN_HEAPSIZE% + set JAVA_HEAP_MAX=-Xmx%YARN_HEAPSIZE%m +) + +if not defined YARN_LOG_DIR ( + set YARN_LOG_DIR=%HADOOP_YARN_HOME%\logs +) + +if not defined YARN_LOGFILE ( + set YARN_LOGFILE=yarn.log +) + +@rem default policy file for service-level authorization +if not defined YARN_POLICYFILE ( + set YARN_POLICYFILE=hadoop-policy.xml +) + +if not defined YARN_ROOT_LOGGER ( + set YARN_ROOT_LOGGER=INFO,console +) + +set YARN_OPTS=%YARN_OPTS% -Dhadoop.log.dir=%YARN_LOG_DIR% +set YARN_OPTS=%YARN_OPTS% -Dyarn.log.dir=%YARN_LOG_DIR% +set YARN_OPTS=%YARN_OPTS% -Dhadoop.log.file=%YARN_LOGFILE% +set YARN_OPTS=%YARN_OPTS% -Dyarn.log.file=%YARN_LOGFILE% +set YARN_OPTS=%YARN_OPTS% -Dyarn.home.dir=%HADOOP_YARN_HOME% +set YARN_OPTS=%YARN_OPTS% -Dyarn.id.str=%YARN_IDENT_STRING% +set YARN_OPTS=%YARN_OPTS% -Dhadoop.home.dir=%HADOOP_YARN_HOME% +set YARN_OPTS=%YARN_OPTS% -Dhadoop.root.logger=%YARN_ROOT_LOGGER% +set YARN_OPTS=%YARN_OPTS% -Dyarn.root.logger=%YARN_ROOT_LOGGER% +if defined JAVA_LIBRARY_PATH ( + set YARN_OPTS=%YARN_OPTS% -Djava.library.path=%JAVA_LIBRARY_PATH% +) set YARN_OPTS=%YARN_OPTS% -Dyarn.policy.file=%YARN_POLICYFILE% \ No newline at end of file Propchange: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.cmd ('svn:eol-style' removed)