Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-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 9A3911049E for ; Mon, 14 Oct 2013 17:07:09 +0000 (UTC) Received: (qmail 16087 invoked by uid 500); 14 Oct 2013 17:07:07 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 16057 invoked by uid 500); 14 Oct 2013 17:07:07 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 15704 invoked by uid 99); 14 Oct 2013 17:07:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Oct 2013 17:07:06 +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:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1F5792388A02; 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-hdfs-project/hadoop-hdfs/src/main/bin: hdfs-config.cmd hdfs.cmd start-dfs.cmd stop-dfs.cmd Date: Mon, 14 Oct 2013 17:06:43 -0000 To: hdfs-commits@hadoop.apache.org From: cnauroth@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131014170644.1F5792388A02@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-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.cmd (contents, props changed) hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd (contents, props changed) hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.cmd (contents, props changed) hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.cmd (contents, props changed) Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.cmd?rev=1531978&r1=1531977&r2=1531978&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.cmd (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.cmd Mon Oct 14 17:06:42 2013 @@ -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 Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.cmd ('svn:eol-style' removed) Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd?rev=1531978&r1=1531977&r2=1531978&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd Mon Oct 14 17:06:42 2013 @@ -1,171 +1,171 @@ -@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 -) - -:main - if exist %HADOOP_CONF_DIR%\hadoop-env.cmd ( - call %HADOOP_CONF_DIR%\hadoop-env.cmd - ) - - set hdfs-command=%1 - call :make_command_arguments %* - - if not defined hdfs-command ( - goto print_usage - ) - - call :%hdfs-command% %hdfs-command-arguments% - set java_arguments=%JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% %hdfs-command-arguments% - call %JAVA% %java_arguments% - -goto :eof - -:namenode - set CLASS=org.apache.hadoop.hdfs.server.namenode.NameNode - set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_NAMENODE_OPTS% - goto :eof - -:zkfc - set CLASS=org.apache.hadoop.hdfs.tools.DFSZKFailoverController - set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_ZKFC_OPTS% - goto :eof - -:secondarynamenode - set CLASS=org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode - set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_SECONDARYNAMENODE_OPTS% - goto :eof - -:datanode - set CLASS=org.apache.hadoop.hdfs.server.datanode.DataNode - set HADOOP_OPTS=%HADOOP_OPTS% -server %HADOOP_DATANODE_OPTS% - goto :eof - -:dfs - set CLASS=org.apache.hadoop.fs.FsShell - set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS% - goto :eof - -:dfsadmin - set CLASS=org.apache.hadoop.hdfs.tools.DFSAdmin - set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS% - goto :eof - -:haadmin - set CLASS=org.apache.hadoop.hdfs.tools.DFSHAAdmin - set CLASSPATH=%CLASSPATH%;%TOOL_PATH% - set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS% - goto :eof - -:fsck - set CLASS=org.apache.hadoop.hdfs.tools.DFSck - set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS% - goto :eof - -:balancer - set CLASS=org.apache.hadoop.hdfs.server.balancer.Balancer - set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_BALANCER_OPTS% - goto :eof - -:jmxget - set CLASS=org.apache.hadoop.hdfs.tools.JMXGet - goto :eof - -:oiv - set CLASS=org.apache.hadoop.hdfs.tools.offlineImageViewer.OfflineImageViewer - goto :eof - -:oev - set CLASS=org.apache.hadoop.hdfs.tools.offlineEditsViewer.OfflineEditsViewer - goto :eof - -:fetchdt - set CLASS=org.apache.hadoop.hdfs.tools.DelegationTokenFetcher - goto :eof - -:getconf - set CLASS=org.apache.hadoop.hdfs.tools.GetConf - goto :eof - -:groups - set CLASS=org.apache.hadoop.hdfs.tools.GetGroups - 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 _hdfsarguments= - :MakeCmdArgsLoop - if [%1]==[] goto :EndLoop - - if not defined _hdfsarguments ( - set _hdfsarguments=%1 - ) else ( - set _hdfsarguments=!_hdfsarguments! %1 - ) - shift - goto :MakeCmdArgsLoop - :EndLoop - set hdfs-command-arguments=%_hdfsarguments% - goto :eof - -:print_usage - @echo Usage: hdfs [--config confdir] COMMAND - @echo where COMMAND is one of: - @echo dfs run a filesystem command on the file systems supported in Hadoop. - @echo namenode -format format the DFS filesystem - @echo secondarynamenode run the DFS secondary namenode - @echo namenode run the DFS namenode - @echo zkfc run the ZK Failover Controller daemon - @echo datanode run a DFS datanode - @echo dfsadmin run a DFS admin client - @echo fsck run a DFS filesystem checking utility - @echo balancer run a cluster balancing utility - @echo jmxget get JMX exported values from NameNode or DataNode. - @echo oiv apply the offline fsimage viewer to an fsimage - @echo oev apply the offline edits viewer to an edits file - @echo fetchdt fetch a delegation token from the NameNode - @echo getconf get config values from configuration - @echo groups get the groups which users belong to - @echo Use -help to see options - @echo. - @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 +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 +) + +:main + if exist %HADOOP_CONF_DIR%\hadoop-env.cmd ( + call %HADOOP_CONF_DIR%\hadoop-env.cmd + ) + + set hdfs-command=%1 + call :make_command_arguments %* + + if not defined hdfs-command ( + goto print_usage + ) + + call :%hdfs-command% %hdfs-command-arguments% + set java_arguments=%JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% %hdfs-command-arguments% + call %JAVA% %java_arguments% + +goto :eof + +:namenode + set CLASS=org.apache.hadoop.hdfs.server.namenode.NameNode + set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_NAMENODE_OPTS% + goto :eof + +:zkfc + set CLASS=org.apache.hadoop.hdfs.tools.DFSZKFailoverController + set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_ZKFC_OPTS% + goto :eof + +:secondarynamenode + set CLASS=org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode + set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_SECONDARYNAMENODE_OPTS% + goto :eof + +:datanode + set CLASS=org.apache.hadoop.hdfs.server.datanode.DataNode + set HADOOP_OPTS=%HADOOP_OPTS% -server %HADOOP_DATANODE_OPTS% + goto :eof + +:dfs + set CLASS=org.apache.hadoop.fs.FsShell + set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS% + goto :eof + +:dfsadmin + set CLASS=org.apache.hadoop.hdfs.tools.DFSAdmin + set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS% + goto :eof + +:haadmin + set CLASS=org.apache.hadoop.hdfs.tools.DFSHAAdmin + set CLASSPATH=%CLASSPATH%;%TOOL_PATH% + set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS% + goto :eof + +:fsck + set CLASS=org.apache.hadoop.hdfs.tools.DFSck + set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS% + goto :eof + +:balancer + set CLASS=org.apache.hadoop.hdfs.server.balancer.Balancer + set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_BALANCER_OPTS% + goto :eof + +:jmxget + set CLASS=org.apache.hadoop.hdfs.tools.JMXGet + goto :eof + +:oiv + set CLASS=org.apache.hadoop.hdfs.tools.offlineImageViewer.OfflineImageViewer + goto :eof + +:oev + set CLASS=org.apache.hadoop.hdfs.tools.offlineEditsViewer.OfflineEditsViewer + goto :eof + +:fetchdt + set CLASS=org.apache.hadoop.hdfs.tools.DelegationTokenFetcher + goto :eof + +:getconf + set CLASS=org.apache.hadoop.hdfs.tools.GetConf + goto :eof + +:groups + set CLASS=org.apache.hadoop.hdfs.tools.GetGroups + 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 _hdfsarguments= + :MakeCmdArgsLoop + if [%1]==[] goto :EndLoop + + if not defined _hdfsarguments ( + set _hdfsarguments=%1 + ) else ( + set _hdfsarguments=!_hdfsarguments! %1 + ) + shift + goto :MakeCmdArgsLoop + :EndLoop + set hdfs-command-arguments=%_hdfsarguments% + goto :eof + +:print_usage + @echo Usage: hdfs [--config confdir] COMMAND + @echo where COMMAND is one of: + @echo dfs run a filesystem command on the file systems supported in Hadoop. + @echo namenode -format format the DFS filesystem + @echo secondarynamenode run the DFS secondary namenode + @echo namenode run the DFS namenode + @echo zkfc run the ZK Failover Controller daemon + @echo datanode run a DFS datanode + @echo dfsadmin run a DFS admin client + @echo fsck run a DFS filesystem checking utility + @echo balancer run a cluster balancing utility + @echo jmxget get JMX exported values from NameNode or DataNode. + @echo oiv apply the offline fsimage viewer to an fsimage + @echo oev apply the offline edits viewer to an edits file + @echo fetchdt fetch a delegation token from the NameNode + @echo getconf get config values from configuration + @echo groups get the groups which users belong to + @echo Use -help to see options + @echo. + @echo Most commands print help when invoked w/o parameters. + +endlocal Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd ('svn:eol-style' removed) Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.cmd?rev=1531978&r1=1531977&r2=1531978&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.cmd (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.cmd Mon Oct 14 17:06:42 2013 @@ -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 Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.cmd ('svn:eol-style' removed) Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.cmd?rev=1531978&r1=1531977&r2=1531978&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.cmd (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.cmd Mon Oct 14 17:06:42 2013 @@ -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 Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.cmd ('svn:eol-style' removed)