svn commit: r1411704 - /hadoop/common/branches/MR-2454/
Author: acmurthy Date: Tue Nov 20 15:39:36 2012 New Revision: 1411704 URL: http://svn.apache.org/viewvc?rev=1411704view=rev Log: Creating branch for MAPREDUCE-2454. Added: hadoop/common/branches/MR-2454/ (props changed) - copied from r1411703, hadoop/common/trunk/ Propchange: hadoop/common/branches/MR-2454/ -- --- svn:ignore (added) +++ svn:ignore Tue Nov 20 15:39:36 2012 @@ -0,0 +1,5 @@ +.classpath +.git +.project +.settings +target Propchange: hadoop/common/branches/MR-2454/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Nov 20 15:39:36 2012 @@ -0,0 +1,3 @@ +/hadoop/common/branches/HDFS-1623:1152502-1296519 +/hadoop/common/branches/HDFS-3042:1306184-1342109 +/hadoop/common/branches/HDFS-3077:1363593-1396941
svn commit: r1411762 - in /hadoop/common/branches/branch-0.23/hadoop-project/src/site: apt/index.apt.vm site.xml
Author: tomwhite
Date: Tue Nov 20 17:46:14 2012
New Revision: 1411762
URL: http://svn.apache.org/viewvc?rev=1411762view=rev
Log:
HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.
Modified:
hadoop/common/branches/branch-0.23/hadoop-project/src/site/apt/index.apt.vm
hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml
Modified:
hadoop/common/branches/branch-0.23/hadoop-project/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/src/site/apt/index.apt.vm?rev=1411762r1=1411761r2=1411762view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-project/src/site/apt/index.apt.vm
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/src/site/apt/index.apt.vm
Tue Nov 20 17:46:14 2012
@@ -34,7 +34,7 @@ Apache Hadoop 0.23
Namenodes.
More details are available in the
- {{{./hadoop-yarn/hadoop-yarn-site/Federation.html}HDFS Federation}}
+ {{{./hadoop-project-dist/hadoop-hdfs/Federation.html}HDFS Federation}}
document.
* {MapReduce NextGen aka YARN aka MRv2}
@@ -65,9 +65,9 @@ Getting Started
The Hadoop documentation includes the information you need to get started
using
Hadoop. Begin with the
- {{{./hadoop-yarn/hadoop-yarn-site/SingleCluster.html}Single Node Setup}}
which
+ {{{./hadoop-project-dist/hadoop-common/SingleCluster.html}Single Node
Setup}} which
shows you how to set up a single-node Hadoop installation. Then move on to
the
- {{{./hadoop-yarn/hadoop-yarn-site/ClusterSetup.html}Cluster Setup}} to learn
how
+ {{{./hadoop-project-dist/hadoop-common/ClusterSetup.html}Cluster Setup}} to
learn how
to set up a multi-node Hadoop installation.
Modified: hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml?rev=1411762r1=1411761r2=1411762view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml Tue Nov
20 17:46:14 2012
@@ -48,31 +48,29 @@
menu name=Common inherit=top
item name=Overview href=index.html/
- item name=Single Node Setup
href=hadoop-yarn/hadoop-yarn-site/SingleCluster.html/
- item name=Cluster Setup
href=hadoop-yarn/hadoop-yarn-site/ClusterSetup.html/
- item name=Hadoop Commands
href=hadoop-project-dist/hadoop-common/commands_manual.html/
+ item name=Single Node Setup
href=hadoop-project-dist/hadoop-common/SingleCluster.html/
+ item name=Cluster Setup
href=hadoop-project-dist/hadoop-common/ClusterSetup.html/
/menu
menu name=HDFS inherit=top
- item name=Federation
href=hadoop-yarn/hadoop-yarn-site/Federation.html/
- item name=WebHDFS REST API
href=hadoop-yarn/hadoop-yarn-site/WebHDFS.html/
+ item name=Federation
href=hadoop-project-dist/hadoop-hdfs/Federation.html/
+ item name=WebHDFS REST API
href=hadoop-project-dist/hadoop-hdfs/WebHDFS.html/
item name=HttpFS Gateway href=hadoop-hdfs-httpfs/index.html/
- item name=HDFS User Guide
href=hadoop-project-dist/hadoop-hdfs/hdfs_user_guide.html/
/menu
-menu name=Yarn/MapReduce inherit=top
+menu name=MapReduce/YARN inherit=top
item name=YARN Architecture
href=hadoop-yarn/hadoop-yarn-site/YARN.html/
- item name=Writing Yarn Applications
href=hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html/
+ item name=Writing YARN Applications
href=hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html/
item name=Capacity Scheduler
href=hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html/
item name=Web Application Proxy
href=hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html/
- item name=Yarn Commands
href=hadoop-yarn/hadoop-yarn-site/YarnCommands.html/
+ item name=YARN Commands
href=hadoop-yarn/hadoop-yarn-site/YarnCommands.html/
/menu
-menu name=YARN REST API's inherit=top
+menu name=YARN REST APIs inherit=top
item name=Introduction
href=hadoop-yarn/hadoop-yarn-site/WebServicesIntro.html/
item name=Resource Manager
href=hadoop-yarn/hadoop-yarn-site/ResourceManagerRest.html/
item name=Node Manager
href=hadoop-yarn/hadoop-yarn-site/NodeManagerRest.html/
- item name=Mapreduce Application Master
href=hadoop-yarn/hadoop-yarn-site/MapredAppMasterRest.html/
+ item name=MR Application Master
href=hadoop-yarn/hadoop-yarn-site/MapredAppMasterRest.html/
item name=History Server
href=hadoop-yarn/hadoop-yarn-site/HistoryServerRest.html/
/menu
@@ -94,8 +92,8 @@
menu name=Configuration inherit=top
item name=core-default.xml
href=hadoop-project-dist/hadoop-common/core-default.xml/
item
svn commit: r1411762 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: ./ src/site/ src/site/apt/ src/site/resources/ src/site/resources/css/
Author: tomwhite
Date: Tue Nov 20 17:46:14 2012
New Revision: 1411762
URL: http://svn.apache.org/viewvc?rev=1411762view=rev
Log:
HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.
Added:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
- copied unchanged from r1411754,
hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ClusterSetup.apt.vm
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm
- copied unchanged from r1411754,
hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SingleCluster.apt.vm
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/resources/
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/resources/css/
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/resources/css/site.css
(with props)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/site.xml
(with props)
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1411762r1=1411761r2=1411762view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Nov 20 17:46:14 2012
@@ -37,6 +37,9 @@ Release 0.23.5 - UNRELEASED
HADOOP-8889. Upgrade to Surefire 2.12.3 (todd)
+HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.
+(tomwhite)
+
OPTIMIZATIONS
HADOOP-8819. Incorrectly is used instead of in some file system
Added:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/resources/css/site.css
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/resources/css/site.css?rev=1411762view=auto
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/resources/css/site.css
(added)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/resources/css/site.css
Tue Nov 20 17:46:14 2012
@@ -0,0 +1,30 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the License); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#banner {
+ height: 93px;
+ background: none;
+}
+
+#bannerLeft img {
+ margin-left: 30px;
+ margin-top: 10px;
+}
+
+#bannerRight img {
+ margin: 17px;
+}
+
Propchange:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/resources/css/site.css
--
svn:eol-style = native
Added:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/site.xml?rev=1411762view=auto
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/site.xml
(added)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/site.xml
Tue Nov 20 17:46:14 2012
@@ -0,0 +1,28 @@
+!--
+ Licensed under the Apache License, Version 2.0 (the License);
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+
svn commit: r1411771 - in /hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common: ./ src/site/ src/site/apt/ src/site/resources/ src/site/resources/css/
Author: tomwhite Date: Tue Nov 20 18:00:40 2012 New Revision: 1411771 URL: http://svn.apache.org/viewvc?rev=1411771view=rev Log: Merge -r 1411761:1411762 from trunk to branch-0.23.5. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation. Added: hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm - copied unchanged from r1411762, hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm - copied unchanged from r1411762, hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common/src/site/resources/ - copied from r1411762, hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/resources/ hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common/src/site/resources/css/ - copied from r1411762, hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/resources/css/ hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common/src/site/resources/css/site.css - copied unchanged from r1411762, hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/resources/css/site.css hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common/src/site/site.xml - copied unchanged from r1411762, hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/site.xml Modified: hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1411771r1=1411770r2=1411771view=diff == --- hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23.5/hadoop-common-project/hadoop-common/CHANGES.txt Tue Nov 20 18:00:40 2012 @@ -25,6 +25,9 @@ Release 0.23.5 - UNRELEASED HADOOP-8889. Upgrade to Surefire 2.12.3 (todd) +HADOOP-8860. Split MapReduce and YARN sections in documentation navigation. +(tomwhite) + OPTIMIZATIONS HADOOP-8819. Incorrectly is used instead of in some file system
svn commit: r1411771 - in /hadoop/common/branches/branch-0.23.5/hadoop-project/src/site: apt/index.apt.vm site.xml
Author: tomwhite
Date: Tue Nov 20 18:00:40 2012
New Revision: 1411771
URL: http://svn.apache.org/viewvc?rev=1411771view=rev
Log:
Merge -r 1411761:1411762 from trunk to branch-0.23.5. Fixes: HADOOP-8860. Split
MapReduce and YARN sections in documentation navigation.
Modified:
hadoop/common/branches/branch-0.23.5/hadoop-project/src/site/apt/index.apt.vm
hadoop/common/branches/branch-0.23.5/hadoop-project/src/site/site.xml
Modified:
hadoop/common/branches/branch-0.23.5/hadoop-project/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-project/src/site/apt/index.apt.vm?rev=1411771r1=1411770r2=1411771view=diff
==
---
hadoop/common/branches/branch-0.23.5/hadoop-project/src/site/apt/index.apt.vm
(original)
+++
hadoop/common/branches/branch-0.23.5/hadoop-project/src/site/apt/index.apt.vm
Tue Nov 20 18:00:40 2012
@@ -34,7 +34,7 @@ Apache Hadoop 0.23
Namenodes.
More details are available in the
- {{{./hadoop-yarn/hadoop-yarn-site/Federation.html}HDFS Federation}}
+ {{{./hadoop-project-dist/hadoop-hdfs/Federation.html}HDFS Federation}}
document.
* {MapReduce NextGen aka YARN aka MRv2}
@@ -65,9 +65,9 @@ Getting Started
The Hadoop documentation includes the information you need to get started
using
Hadoop. Begin with the
- {{{./hadoop-yarn/hadoop-yarn-site/SingleCluster.html}Single Node Setup}}
which
+ {{{./hadoop-project-dist/hadoop-common/SingleCluster.html}Single Node
Setup}} which
shows you how to set up a single-node Hadoop installation. Then move on to
the
- {{{./hadoop-yarn/hadoop-yarn-site/ClusterSetup.html}Cluster Setup}} to learn
how
+ {{{./hadoop-project-dist/hadoop-common/ClusterSetup.html}Cluster Setup}} to
learn how
to set up a multi-node Hadoop installation.
Modified: hadoop/common/branches/branch-0.23.5/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-project/src/site/site.xml?rev=1411771r1=1411770r2=1411771view=diff
==
--- hadoop/common/branches/branch-0.23.5/hadoop-project/src/site/site.xml
(original)
+++ hadoop/common/branches/branch-0.23.5/hadoop-project/src/site/site.xml Tue
Nov 20 18:00:40 2012
@@ -48,31 +48,29 @@
menu name=Common inherit=top
item name=Overview href=index.html/
- item name=Single Node Setup
href=hadoop-yarn/hadoop-yarn-site/SingleCluster.html/
- item name=Cluster Setup
href=hadoop-yarn/hadoop-yarn-site/ClusterSetup.html/
- item name=Hadoop Commands
href=hadoop-project-dist/hadoop-common/commands_manual.html/
+ item name=Single Node Setup
href=hadoop-project-dist/hadoop-common/SingleCluster.html/
+ item name=Cluster Setup
href=hadoop-project-dist/hadoop-common/ClusterSetup.html/
/menu
menu name=HDFS inherit=top
- item name=Federation
href=hadoop-yarn/hadoop-yarn-site/Federation.html/
- item name=WebHDFS REST API
href=hadoop-yarn/hadoop-yarn-site/WebHDFS.html/
+ item name=Federation
href=hadoop-project-dist/hadoop-hdfs/Federation.html/
+ item name=WebHDFS REST API
href=hadoop-project-dist/hadoop-hdfs/WebHDFS.html/
item name=HttpFS Gateway href=hadoop-hdfs-httpfs/index.html/
- item name=HDFS User Guide
href=hadoop-project-dist/hadoop-hdfs/hdfs_user_guide.html/
/menu
-menu name=Yarn/MapReduce inherit=top
+menu name=MapReduce/YARN inherit=top
item name=YARN Architecture
href=hadoop-yarn/hadoop-yarn-site/YARN.html/
- item name=Writing Yarn Applications
href=hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html/
+ item name=Writing YARN Applications
href=hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html/
item name=Capacity Scheduler
href=hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html/
item name=Web Application Proxy
href=hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html/
- item name=Yarn Commands
href=hadoop-yarn/hadoop-yarn-site/YarnCommands.html/
+ item name=YARN Commands
href=hadoop-yarn/hadoop-yarn-site/YarnCommands.html/
/menu
-menu name=YARN REST API's inherit=top
+menu name=YARN REST APIs inherit=top
item name=Introduction
href=hadoop-yarn/hadoop-yarn-site/WebServicesIntro.html/
item name=Resource Manager
href=hadoop-yarn/hadoop-yarn-site/ResourceManagerRest.html/
item name=Node Manager
href=hadoop-yarn/hadoop-yarn-site/NodeManagerRest.html/
- item name=Mapreduce Application Master
href=hadoop-yarn/hadoop-yarn-site/MapredAppMasterRest.html/
+ item name=MR Application Master
href=hadoop-yarn/hadoop-yarn-site/MapredAppMasterRest.html/
item name=History Server
href=hadoop-yarn/hadoop-yarn-site/HistoryServerRest.html/
/menu
@@ -94,8 +92,8 @@
menu name=Configuration inherit=top
item
svn commit: r1411819 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt conf/hadoop-env.cmd
Author: suresh Date: Tue Nov 20 19:47:41 2012 New Revision: 1411819 URL: http://svn.apache.org/viewvc?rev=1411819view=rev Log: HADOOP-9062. hadoop-env.cmd overwrites the value of *_OPTS set before install. Contributed by Ivan Mitic. Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt hadoop/common/branches/branch-1-win/conf/hadoop-env.cmd Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1411819r1=1411818r2=1411819view=diff == --- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original) +++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Tue Nov 20 19:47:41 2012 @@ -225,3 +225,6 @@ Branch-hadoop-1-win - unreleased returned via winutils. (Ivan Mitic via suresh) HADOOP-9050. Remove java5 dependencies from build. (Raja Aluri via suresh) + +HADOOP-9062. hadoop-env.cmd overwrites the value of *_OPTS set before +install. (Ivan Mitic via suresh) Modified: hadoop/common/branches/branch-1-win/conf/hadoop-env.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/conf/hadoop-env.cmd?rev=1411819r1=1411818r2=1411819view=diff == --- hadoop/common/branches/branch-1-win/conf/hadoop-env.cmd (original) +++ hadoop/common/branches/branch-1-win/conf/hadoop-env.cmd Tue Nov 20 19:47:41 2012 @@ -21,12 +21,12 @@ if not defined JAVA_HOME ( @rem set HADOOP_OPTS=-server @rem Command specific options appended to HADOOP_OPTS when specified -set HADOOP_NAMENODE_OPTS=-Dcom.sun.management.jmxremote -set HADOOP_SECONDARYNAMENODE_OPTS=-Dcom.sun.management.jmxremote -set HADOOP_DATANODE_OPTS=-Dcom.sun.management.jmxremote -set HADOOP_BALANCER_OPTS=-Dcom.sun.management.jmxremote -set HADOOP_JOBTRACKER_OPTS=-Dcom.sun.management.jmxremote -set HADOOP_TASKTRACKER_OPTS=-Dcom.sun.management.jmxremote +set HADOOP_NAMENODE_OPTS=-Dcom.sun.management.jmxremote %HADOOP_NAMENODE_OPTS% +set HADOOP_SECONDARYNAMENODE_OPTS=-Dcom.sun.management.jmxremote %HADOOP_SECONDARYNAMENODE_OPTS% +set HADOOP_DATANODE_OPTS=-Dcom.sun.management.jmxremote %HADOOP_DATANODE_OPTS% +set HADOOP_BALANCER_OPTS=-Dcom.sun.management.jmxremote %HADOOP_BALANCER_OPTS% +set HADOOP_JOBTRACKER_OPTS=-Dcom.sun.management.jmxremote %HADOOP_JOBTRACKER_OPTS% +set HADOOP_TASKTRACKER_OPTS=-Dcom.sun.management.jmxremote %HADOOP_TASKTRACKER_OPTS% @rem The following applies to multiple commands (fs, dfs, fsck, distcp etc) @rem set HADOOP_CLIENT_OPTS
svn commit: r1411821 - /hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
Author: suresh Date: Tue Nov 20 19:48:59 2012 New Revision: 1411821 URL: http://svn.apache.org/viewvc?rev=1411821view=rev Log: Attribute the contribution of HADOOP-9062 to the right contributor. Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1411821r1=1411820r2=1411821view=diff == --- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original) +++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Tue Nov 20 19:48:59 2012 @@ -227,4 +227,4 @@ Branch-hadoop-1-win - unreleased HADOOP-9050. Remove java5 dependencies from build. (Raja Aluri via suresh) HADOOP-9062. hadoop-env.cmd overwrites the value of *_OPTS set before -install. (Ivan Mitic via suresh) +install. (Ganeshan Iyer via suresh)
svn commit: r1411879 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
Author: eli
Date: Tue Nov 20 21:13:48 2012
New Revision: 1411879
URL: http://svn.apache.org/viewvc?rev=1411879view=rev
Log:
HADOOP-9042. Add a test for umask in FileSystemContractBaseTest. Contributed by
Colin McCabe
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1411879r1=1411878r2=1411879view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Nov
20 21:13:48 2012
@@ -373,6 +373,9 @@ Release 2.0.3-alpha - Unreleased
HADOOP-9035. Generalize setup of LoginContext (daryn via bobby)
+HADOOP-9042. Add a test for umask in FileSystemContractBaseTest.
+(Colin McCabe via eli)
+
OPTIMIZATIONS
HADOOP-8866. SampleQuantiles#query is O(N^2) instead of O(N). (Andrew Wang
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java?rev=1411879r1=1411878r2=1411879view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
Tue Nov 20 21:13:48 2012
@@ -23,11 +23,13 @@ import java.io.IOException;
import junit.framework.TestCase;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.FsPermission;
/**
* p
@@ -43,7 +45,7 @@ import org.apache.hadoop.fs.Path;
* /p
*/
public abstract class FileSystemContractBaseTest extends TestCase {
-
+ protected final static String TEST_UMASK = 062;
protected FileSystem fs;
protected byte[] data = new byte[getBlockSize() * 2]; // two blocks of data
{
@@ -151,7 +153,26 @@ public abstract class FileSystemContract
assertFalse(fs.exists(testDeepSubDir));
}
-
+
+ public void testMkdirsWithUmask() throws Exception {
+if (fs.getScheme().equals(s3) || fs.getScheme().equals(s3n)) {
+ // skip permission tests for S3FileSystem until HDFS-1333 is fixed.
+ return;
+}
+Configuration conf = fs.getConf();
+String oldUmask =
conf.get(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY);
+try {
+ conf.set(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY, TEST_UMASK);
+ final Path dir = new Path(/test/newDir);
+ assertTrue(fs.mkdirs(dir, new FsPermission((short)0777)));
+ FileStatus status = fs.getFileStatus(dir);
+ assertTrue(status.isDirectory());
+ assertEquals((short)0715, status.getPermission().toShort());
+} finally {
+ conf.set(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY, oldUmask);
+}
+ }
+
public void testGetFileStatusThrowsExceptionForNonExistentFile()
throws Exception {
try {
svn commit: r1411882 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
Author: eli
Date: Tue Nov 20 21:20:07 2012
New Revision: 1411882
URL: http://svn.apache.org/viewvc?rev=1411882view=rev
Log:
HADOOP-9042. Add a test for umask in FileSystemContractBaseTest. Contributed by
Colin McCabe
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1411882r1=1411881r2=1411882view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Nov 20 21:20:07 2012
@@ -91,6 +91,9 @@ Release 2.0.3-alpha - Unreleased
HADOOP-8926. hadoop.util.PureJavaCrc32 cache hit-ratio is low for static
data (Gopal V via bobby)
+HADOOP-9042. Add a test for umask in FileSystemContractBaseTest.
+(Colin McCabe via eli)
+
BUG FIXES
HADOOP-8795. BASH tab completion doesn't look in PATH, assumes path to
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java?rev=1411882r1=1411881r2=1411882view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
Tue Nov 20 21:20:07 2012
@@ -23,11 +23,13 @@ import java.io.IOException;
import junit.framework.TestCase;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.FsPermission;
/**
* p
@@ -43,7 +45,7 @@ import org.apache.hadoop.fs.Path;
* /p
*/
public abstract class FileSystemContractBaseTest extends TestCase {
-
+ protected final static String TEST_UMASK = 062;
protected FileSystem fs;
protected byte[] data = new byte[getBlockSize() * 2]; // two blocks of data
{
@@ -151,7 +153,26 @@ public abstract class FileSystemContract
assertFalse(fs.exists(testDeepSubDir));
}
-
+
+ public void testMkdirsWithUmask() throws Exception {
+if (fs.getScheme().equals(s3) || fs.getScheme().equals(s3n)) {
+ // skip permission tests for S3FileSystem until HDFS-1333 is fixed.
+ return;
+}
+Configuration conf = fs.getConf();
+String oldUmask =
conf.get(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY);
+try {
+ conf.set(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY, TEST_UMASK);
+ final Path dir = new Path(/test/newDir);
+ assertTrue(fs.mkdirs(dir, new FsPermission((short)0777)));
+ FileStatus status = fs.getFileStatus(dir);
+ assertTrue(status.isDirectory());
+ assertEquals((short)0715, status.getPermission().toShort());
+} finally {
+ conf.set(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY, oldUmask);
+}
+ }
+
public void testGetFileStatusThrowsExceptionForNonExistentFile()
throws Exception {
try {
svn commit: r1411884 - /hadoop/common/trunk/pom.xml
Author: tgraves
Date: Tue Nov 20 21:22:20 2012
New Revision: 1411884
URL: http://svn.apache.org/viewvc?rev=1411884view=rev
Log:
HADOOP-9072. Hadoop-Common-0.23-Build Fails to build in Jenkins (Robert Parker
via tgraves)
Modified:
hadoop/common/trunk/pom.xml
Modified: hadoop/common/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/pom.xml?rev=1411884r1=1411883r2=1411884view=diff
==
--- hadoop/common/trunk/pom.xml (original)
+++ hadoop/common/trunk/pom.xml Tue Nov 20 21:22:20 2012
@@ -517,7 +517,7 @@ xsi:schemaLocation=http://maven.apache.
groupIdcom.atlassian.maven.plugins/groupId
artifactIdmaven-clover2-plugin/artifactId
configuration
- includesAllSourceRootstrue/includesAllSourceRoots
+ includesAllSourceRootsfalse/includesAllSourceRoots
includesTestSourceRootstrue/includesTestSourceRoots
licenseLocation${cloverLicenseLocation}/licenseLocation
cloverDatabase${cloverDatabase}/cloverDatabase
svn commit: r1411884 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: tgraves Date: Tue Nov 20 21:22:20 2012 New Revision: 1411884 URL: http://svn.apache.org/viewvc?rev=1411884view=rev Log: HADOOP-9072. Hadoop-Common-0.23-Build Fails to build in Jenkins (Robert Parker via tgraves) Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1411884r1=1411883r2=1411884view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Nov 20 21:22:20 2012 @@ -1142,6 +1142,9 @@ Release 0.23.6 - UNRELEASED BUG FIXES +HADOOP-9072. Hadoop-Common-0.23-Build Fails to build in Jenkins +(Robert Parker via tgraves) + Release 0.23.5 - UNRELEASED INCOMPATIBLE CHANGES
svn commit: r1411891 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: tgraves Date: Tue Nov 20 21:28:46 2012 New Revision: 1411891 URL: http://svn.apache.org/viewvc?rev=1411891view=rev Log: merge -r 1411883:1411884 from trunk. FIXES: HADOOP-9072 Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1411891r1=1411890r2=1411891view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Nov 20 21:28:46 2012 @@ -854,6 +854,9 @@ Release 0.23.6 - UNRELEASED BUG FIXES +HADOOP-9072. Hadoop-Common-0.23-Build Fails to build in Jenkins +(Robert Parker via tgraves) + Release 0.23.5 - UNRELEASED INCOMPATIBLE CHANGES
svn commit: r1411891 - /hadoop/common/branches/branch-2/pom.xml
Author: tgraves
Date: Tue Nov 20 21:28:46 2012
New Revision: 1411891
URL: http://svn.apache.org/viewvc?rev=1411891view=rev
Log:
merge -r 1411883:1411884 from trunk. FIXES: HADOOP-9072
Modified:
hadoop/common/branches/branch-2/pom.xml
Modified: hadoop/common/branches/branch-2/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/pom.xml?rev=1411891r1=1411890r2=1411891view=diff
==
--- hadoop/common/branches/branch-2/pom.xml (original)
+++ hadoop/common/branches/branch-2/pom.xml Tue Nov 20 21:28:46 2012
@@ -410,7 +410,7 @@ xsi:schemaLocation=http://maven.apache.
groupIdcom.atlassian.maven.plugins/groupId
artifactIdmaven-clover2-plugin/artifactId
configuration
- includesAllSourceRootstrue/includesAllSourceRoots
+ includesAllSourceRootsfalse/includesAllSourceRoots
includesTestSourceRootstrue/includesTestSourceRoots
licenseLocation${cloverLicenseLocation}/licenseLocation
cloverDatabase${cloverDatabase}/cloverDatabase
svn commit: r1411892 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Author: tgraves Date: Tue Nov 20 21:28:54 2012 New Revision: 1411892 URL: http://svn.apache.org/viewvc?rev=1411892view=rev Log: merge -r 1411883:1411884 from trunk. FIXES: HADOOP-9072 Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1411892r1=1411891r2=1411892view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Tue Nov 20 21:28:54 2012 @@ -12,6 +12,9 @@ Release 0.23.6 - UNRELEASED BUG FIXES +HADOOP-9072. Hadoop-Common-0.23-Build Fails to build in Jenkins +(Robert Parker via tgraves) + Release 0.23.5 - UNRELEASED INCOMPATIBLE CHANGES
svn commit: r1411892 - /hadoop/common/branches/branch-0.23/pom.xml
Author: tgraves
Date: Tue Nov 20 21:28:54 2012
New Revision: 1411892
URL: http://svn.apache.org/viewvc?rev=1411892view=rev
Log:
merge -r 1411883:1411884 from trunk. FIXES: HADOOP-9072
Modified:
hadoop/common/branches/branch-0.23/pom.xml
Modified: hadoop/common/branches/branch-0.23/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/pom.xml?rev=1411892r1=1411891r2=1411892view=diff
==
--- hadoop/common/branches/branch-0.23/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/pom.xml Tue Nov 20 21:28:54 2012
@@ -398,7 +398,7 @@
groupIdcom.atlassian.maven.plugins/groupId
artifactIdmaven-clover2-plugin/artifactId
configuration
- includesAllSourceRootstrue/includesAllSourceRoots
+ includesAllSourceRootsfalse/includesAllSourceRoots
includesTestSourceRootstrue/includesTestSourceRoots
licenseLocation${cloverLicenseLocation}/licenseLocation
cloverDatabase${cloverDatabase}/cloverDatabase
svn commit: r1411988 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/FileContext.java
Author: suresh
Date: Wed Nov 21 05:55:48 2012
New Revision: 1411988
URL: http://svn.apache.org/viewvc?rev=1411988view=rev
Log:
HADOOP-9075. FileContext#FSLinkResolver should be made static. Contributed by
Arpit Agarwal.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1411988r1=1411987r2=1411988view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Nov
21 05:55:48 2012
@@ -132,7 +132,11 @@ Trunk (Unreleased)
HADOOP-9004. Allow security unit tests to use external KDC. (Stephen Chu
via suresh)
-HADOOP-6616. Improve documentation for rack awareness. (Adam Faris via
jghoman)
+HADOOP-6616. Improve documentation for rack awareness. (Adam Faris via
+jghoman)
+
+HADOOP-9075. FileContext#FSLinkResolver should be made static.
+(Arpit Agarwal via suresh)
BUG FIXES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java?rev=1411988r1=1411987r2=1411988view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
Wed Nov 21 05:55:48 2012
@@ -1119,7 +1119,7 @@ public final class FileContext {
* @param target The symlink's absolute target
* @return Fully qualified version of the target.
*/
- private Path qualifySymlinkTarget(final AbstractFileSystem pathFS,
+ private static Path qualifySymlinkTarget(final AbstractFileSystem pathFS,
Path pathWithLink, Path target) {
// NB: makeQualified uses the target's scheme and authority, if
// specified, and the scheme and authority of pathFS, if not.
@@ -2321,7 +2321,7 @@ public final class FileContext {
* Class used to perform an operation on and resolve symlinks in a
* path. The operation may potentially span multiple file systems.
*/
- protected abstract class FSLinkResolverT {
+ protected static abstract class FSLinkResolverT {
// The maximum number of symbolic link components in a path
private static final int MAX_PATH_LINKS = 32;
