svn commit: r1509569 - in /hadoop/common/branches/branch-1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/LeaseRenewer.java
Author: szetszwo
Date: Fri Aug 2 07:18:36 2013
New Revision: 1509569
URL: http://svn.apache.org/r1509569
Log:
HDFS-5028. LeaseRenewer throws ConcurrentModificationException when timeout.
Contributed by zhaoyunjiong
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/LeaseRenewer.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1509569r1=1509568r2=1509569view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Fri Aug 2 07:18:36 2013
@@ -114,6 +114,9 @@ Release 1.3.0 - unreleased
HADOOP-9801. Configuration#writeXml uses platform defaulting encoding,
which
may mishandle multi-byte characters. (cnauroth)
+HDFS-5028. LeaseRenewer throws ConcurrentModificationException when
timeout.
+(zhaoyunjiong via szetszwo)
+
Release 1.2.1 - 2013.07.06
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/LeaseRenewer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/LeaseRenewer.java?rev=1509569r1=1509568r2=1509569view=diff
==
---
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/LeaseRenewer.java
(original)
+++
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/LeaseRenewer.java
Fri Aug 2 07:18:36 2013
@@ -403,8 +403,8 @@ class LeaseRenewer {
LOG.warn(Failed to renew lease for + clientsString() + for
+ (getRenewalTime()/1000) + seconds. Aborting ..., ie);
synchronized (this) {
-for(DFSClient c : dfsclients) {
- c.abort();
+while (!dfsclients.isEmpty()) {
+ dfsclients.get(0).abort();
}
}
break;
svn commit: r1509796 - in /hadoop/common/site/main: author/src/documentation/content/xdocs/bylaws.xml publish/bylaws.html publish/bylaws.pdf publish/who.html publish/who.pdf
Author: cdouglas
Date: Fri Aug 2 18:08:02 2013
New Revision: 1509796
URL: http://svn.apache.org/r1509796
Log:
Change bylaws to add branch committers per http://s.apache.org/RHJ
Modified:
hadoop/common/site/main/author/src/documentation/content/xdocs/bylaws.xml
hadoop/common/site/main/publish/bylaws.html
hadoop/common/site/main/publish/bylaws.pdf
hadoop/common/site/main/publish/who.html
hadoop/common/site/main/publish/who.pdf
Modified:
hadoop/common/site/main/author/src/documentation/content/xdocs/bylaws.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/bylaws.xml?rev=1509796r1=1509795r2=1509796view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/bylaws.xml
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/bylaws.xml
Fri Aug 2 18:08:02 2013
@@ -76,6 +76,13 @@
commit access from the PMC. Such reinstatement is subject to
consensus approval of active PMC members./p
+pSignificant, pervasive features are often developed in a speculative
+branch of the repository. The PMC may grant commit rights on the
+branch to its consistent contributors, while the initiative is active.
+Branch committers are responsible for shepherding their feature into
+an active release and do not cast binding votes or vetoes in the
+project./p
+
pAll Apache committers are required to have a signed Contributor
License Agreement (CLA) on file with the Apache Software
Foundation. There is a a
@@ -220,6 +227,9 @@
Consensus approval requires 3 binding +1 votes
and no binding vetoes./li
+li strongLazy Consensus -/strong
+ Lazy consensus requires no -1 votes ('silence gives assent')./li
+
li strongLazy Majority - /strong
A lazy majority vote requires 3 binding +1
votes and more binding +1 votes than -1 votes./li
@@ -279,6 +289,12 @@
pLazy 2/3 majority of PMC members/p/li
+ li strongNew Branch Committer/strong
+
+pWhen a branch committer is proposed for the PMC/p
+
+pLazy consensus of active PMC members/p/li
+
li strongNew Committer/strong
pWhen a new committer is proposed for the project/p
@@ -291,6 +307,13 @@
pConsensus approval of active PMC members/p/li
+ li strongBranch Committer Removal/strong
+
+pWhen removal of commit privileges is sought strongor/strong
+ when the branch is merged to the mainline/p
+
+pLazy 2/3 majority of active PMC members/p/li
+
li strongCommitter Removal/strong
pWhen removal of commit privileges is sought. Note: Such
Modified: hadoop/common/site/main/publish/bylaws.html
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.html?rev=1509796r1=1509795r2=1509796view=diff
==
--- hadoop/common/site/main/publish/bylaws.html (original)
+++ hadoop/common/site/main/publish/bylaws.html Fri Aug 2 18:08:02 2013
@@ -314,6 +314,14 @@ document.write(Last Published: + docu
consensus approval of active PMC members./p
+pSignificant, pervasive features are often developed in a speculative
+branch of the repository. The PMC may grant commit rights on the
+branch to its consistent contributors, while the initiative is active.
+Branch committers are responsible for shepherding their feature into
+an active release and do not cast binding votes or vetoes in the
+project./p
+
+
pAll Apache committers are required to have a signed Contributor
License Agreement (CLA) on file with the Apache Software
Foundation. There is a a
href=http://www.apache.org/dev/committers.html;Committer
@@ -409,7 +417,7 @@ document.write(Last Published: + docu
/div
-a name=N10090/aa name=Decision+Making/a
+a name=N10093/aa name=Decision+Making/a
h2 class=h3Decision Making/h2
div class=section
pWithin the Hadoop project, different types of decisions require
@@ -503,6 +511,11 @@ document.write(Last Published: + docu
li
+strongLazy Consensus -/strong
+ Lazy consensus requires no -1 votes ('silence gives assent')./li
+
+
+li
strongLazy Majority - /strong
A lazy majority vote requires 3 binding +1
votes and more binding +1 votes than -1 votes./li
@@ -593,6 +606,17 @@ document.write(Last Published: + docu
li
+strongNew Branch Committer/strong
+
+
+pWhen a branch committer is proposed for the PMC/p
+
+
+pLazy consensus of active PMC members/p
+/li
+
+
+li
strongNew Committer/strong
@@ -615,6 +639,18 @@
svn commit: r1509874 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/FileSystemLinkResolver.java
Author: cmccabe
Date: Fri Aug 2 21:42:38 2013
New Revision: 1509874
URL: http://svn.apache.org/r1509874
Log:
HADOOP-9761. ViewFileSystem#rename fails when using DistributedFileSystem
(Andrew Wang via Colin Patrick McCabe)
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/FileSystemLinkResolver.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=1509874r1=1509873r2=1509874view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug
2 21:42:38 2013
@@ -312,6 +312,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-9582. Non-existent file to hadoop fs -conf doesn't throw error
(Ashwin Shankar via jlowe)
+HADOOP-9761. ViewFileSystem#rename fails when using DistributedFileSystem.
+(Andrew Wang via Colin Patrick McCabe)
+
Release 2.1.1-beta - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemLinkResolver.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemLinkResolver.java?rev=1509874r1=1509873r2=1509874view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemLinkResolver.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemLinkResolver.java
Fri Aug 2 21:42:38 2013
@@ -73,7 +73,9 @@ public abstract class FileSystemLinkReso
int count = 0;
T in = null;
Path p = path;
-FileSystem fs = FileSystem.getFSofPath(p, filesys.getConf());
+// Assumes path belongs to this FileSystem.
+// Callers validate this by passing paths through FileSystem#checkPath
+FileSystem fs = filesys;
for (boolean isLink = true; isLink;) {
try {
in = doCall(p);
svn commit: r1509876 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/FileSystemLinkResolver.java
Author: cmccabe
Date: Fri Aug 2 21:47:43 2013
New Revision: 1509876
URL: http://svn.apache.org/r1509876
Log:
HADOOP-9761. ViewFileSystem#rename fails when using DistributedFileSystem
(Andrew Wang via Colin Patrick 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/main/java/org/apache/hadoop/fs/FileSystemLinkResolver.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=1509876r1=1509875r2=1509876view=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
Fri Aug 2 21:47:43 2013
@@ -39,6 +39,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-9806 PortmapInterface should check if the procedure is out-of-range
(brandonli)
+HADOOP-9761. ViewFileSystem#rename fails when using DistributedFileSystem.
+(Andrew Wang via Colin Patrick McCabe)
+
Release 2.1.1-beta - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemLinkResolver.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemLinkResolver.java?rev=1509876r1=1509875r2=1509876view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemLinkResolver.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemLinkResolver.java
Fri Aug 2 21:47:43 2013
@@ -73,7 +73,9 @@ public abstract class FileSystemLinkReso
int count = 0;
T in = null;
Path p = path;
-FileSystem fs = FileSystem.getFSofPath(p, filesys.getConf());
+// Assumes path belongs to this FileSystem.
+// Callers validate this by passing paths through FileSystem#checkPath
+FileSystem fs = filesys;
for (boolean isLink = true; isLink;) {
try {
in = doCall(p);
svn commit: r1509900 - /hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Author: jlowe
Date: Fri Aug 2 22:51:34 2013
New Revision: 1509900
URL: http://svn.apache.org/r1509900
Log:
MAPREDUCE-5440. TestCopyCommitter Fails on JDK7. Contributed by Robert Parker
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1509900r1=1509899r2=1509900view=diff
==
---
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
(original)
+++
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Fri Aug 2 22:51:34 2013
@@ -169,6 +169,7 @@ public class TestCopyCommitter {
Assert.fail(Preserve status failure);
} finally {
TestDistCpUtils.delete(fs, /tmp1);
+ conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS);
}
}
svn commit: r1509901 - /hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Author: jlowe
Date: Fri Aug 2 22:53:52 2013
New Revision: 1509901
URL: http://svn.apache.org/r1509901
Log:
svn merge -c 1509900 FIXES: MAPREDUCE-5440. TestCopyCommitter Fails on JDK7.
Contributed by Robert Parker
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1509901r1=1509900r2=1509901view=diff
==
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Fri Aug 2 22:53:52 2013
@@ -169,6 +169,7 @@ public class TestCopyCommitter {
Assert.fail(Preserve status failure);
} finally {
TestDistCpUtils.delete(fs, /tmp1);
+ conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS);
}
}
svn commit: r1509902 - /hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Author: jlowe
Date: Fri Aug 2 22:54:26 2013
New Revision: 1509902
URL: http://svn.apache.org/r1509902
Log:
svn merge -c 1509900 FIXES: MAPREDUCE-5440. TestCopyCommitter Fails on JDK7.
Contributed by Robert Parker
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1509902r1=1509901r2=1509902view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Fri Aug 2 22:54:26 2013
@@ -169,6 +169,7 @@ public class TestCopyCommitter {
Assert.fail(Preserve status failure);
} finally {
TestDistCpUtils.delete(fs, /tmp1);
+ conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS);
}
}
svn commit: r1509903 - /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Author: jlowe
Date: Fri Aug 2 22:56:50 2013
New Revision: 1509903
URL: http://svn.apache.org/r1509903
Log:
svn merge -c 1509900 FIXES: MAPREDUCE-5440. TestCopyCommitter Fails on JDK7.
Contributed by Robert Parker
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1509903r1=1509902r2=1509903view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Fri Aug 2 22:56:50 2013
@@ -169,6 +169,7 @@ public class TestCopyCommitter {
Assert.fail(Preserve status failure);
} finally {
TestDistCpUtils.delete(fs, /tmp1);
+ conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS);
}
}
