You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2015/08/14 12:46:06 UTC
[1/4] hadoop git commit: HDFS-8270. create() always retried with
hardcoded timeout when file already exists with open lease (Contributed by
J.Andreina)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 eef052612 -> 0b6574380
refs/heads/branch-2.6 e9c8d8c58 -> 04a7000c8
refs/heads/branch-2.7 ca3215a71 -> 4d94bc1d9
refs/heads/trunk fc508b41a -> 84bf71295
HDFS-8270. create() always retried with hardcoded timeout when file already exists with open lease (Contributed by J.Andreina)
(cherry picked from commit 54f83d9bd917e8641e902c5f0695e65ded472f9a)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java
(cherry picked from commit 8090a6ee63c414ac5b76c21df1f6b5a188e873d6)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/04a7000c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/04a7000c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/04a7000c
Branch: refs/heads/branch-2.6
Commit: 04a7000c8d955a134d86967f4b4622ea920e1ea7
Parents: e9c8d8c
Author: Vinayakumar B <vi...@apache.org>
Authored: Wed Jun 3 12:11:46 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Fri Aug 14 16:11:30 2015 +0530
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/hdfs/NameNodeProxies.java | 15 ---------------
.../org/apache/hadoop/hdfs/TestFileCreation.java | 3 +--
3 files changed, 4 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/04a7000c/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index ca1d89f..d65dcb1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -47,6 +47,9 @@ Release 2.6.1 - UNRELEASED
HDFS-7225. Remove stale block invalidation work when DN re-registers with
different UUID. (Zhe Zhang and Andrew Wang)
+ HDFS-8270. create() always retried with hardcoded timeout when file already
+ exists with open lease (J.Andreina via vinayakumarb)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/04a7000c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java
index b261220..c7e2cf2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java
@@ -42,7 +42,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSClient.Conf;
-import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
import org.apache.hadoop.hdfs.protocol.ClientProtocol;
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.hdfs.protocolPB.ClientNamenodeProtocolPB;
@@ -68,7 +67,6 @@ import org.apache.hadoop.io.retry.RetryProxy;
import org.apache.hadoop.io.retry.RetryUtils;
import org.apache.hadoop.ipc.ProtobufRpcEngine;
import org.apache.hadoop.ipc.RPC;
-import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.RefreshUserMappingsProtocol;
import org.apache.hadoop.security.SecurityUtil;
@@ -425,22 +423,9 @@ public class NameNodeProxies {
if (withRetries) { // create the proxy with retries
- RetryPolicy createPolicy = RetryPolicies
- .retryUpToMaximumCountWithFixedSleep(5,
- HdfsConstants.LEASE_SOFTLIMIT_PERIOD, TimeUnit.MILLISECONDS);
-
- Map<Class<? extends Exception>, RetryPolicy> remoteExceptionToPolicyMap
- = new HashMap<Class<? extends Exception>, RetryPolicy>();
- remoteExceptionToPolicyMap.put(AlreadyBeingCreatedException.class,
- createPolicy);
-
- RetryPolicy methodPolicy = RetryPolicies.retryByRemoteException(
- defaultPolicy, remoteExceptionToPolicyMap);
Map<String, RetryPolicy> methodNameToPolicyMap
= new HashMap<String, RetryPolicy>();
- methodNameToPolicyMap.put("create", methodPolicy);
-
ClientProtocol translatorProxy =
new ClientNamenodeProtocolTranslatorPB(proxy);
return (ClientProtocol) RetryProxy.create(
http://git-wip-us.apache.org/repos/asf/hadoop/blob/04a7000c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java
index 3a399f3..8e88b62 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java
@@ -408,9 +408,8 @@ public class TestFileCreation {
GenericTestUtils.assertExceptionContains("already being created by",
abce);
}
- // NameNodeProxies' createNNProxyWithClientProtocol has 5 retries.
assertCounter("AlreadyBeingCreatedExceptionNumOps",
- 6L, getMetrics(metricsName));
+ 1L, getMetrics(metricsName));
FSDataOutputStream stm2 = fs2.create(p, true);
stm2.write(2);
stm2.close();
[2/4] hadoop git commit: HDFS-8270. create() always retried with
hardcoded timeout when file already exists with open lease (Contributed by
J.Andreina) Moved to 2.6.1
Posted by vi...@apache.org.
HDFS-8270. create() always retried with hardcoded timeout when file already exists with open lease (Contributed by J.Andreina)
Moved to 2.6.1
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/84bf7129
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/84bf7129
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/84bf7129
Branch: refs/heads/trunk
Commit: 84bf71295a5e52b2a7bb69440a885a25bc75f544
Parents: fc508b4
Author: Vinayakumar B <vi...@apache.org>
Authored: Fri Aug 14 16:13:30 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Fri Aug 14 16:13:30 2015 +0530
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/84bf7129/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index dba4535..0b28709 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1265,9 +1265,6 @@ Release 2.7.1 - 2015-07-06
HDFS-8451. DFSClient probe for encryption testing interprets empty URI
property for "enabled". (Steve Loughran via xyao)
- HDFS-8270. create() always retried with hardcoded timeout when file already
- exists with open lease (J.Andreina via vinayakumarb)
-
HDFS-8523. Remove usage information on unsupported operation
"fsck -showprogress" from branch-2 (J.Andreina via vinayakumarb)
@@ -2339,6 +2336,9 @@ Release 2.6.1 - UNRELEASED
HDFS-7225. Remove stale block invalidation work when DN re-registers with
different UUID. (Zhe Zhang and Andrew Wang)
+ HDFS-8270. create() always retried with hardcoded timeout when file already
+ exists with open lease (J.Andreina via vinayakumarb)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
[4/4] hadoop git commit: HDFS-8270. create() always retried with
hardcoded timeout when file already exists with open lease (Contributed by
J.Andreina) Moved to 2.6.1
Posted by vi...@apache.org.
HDFS-8270. create() always retried with hardcoded timeout when file already exists with open lease (Contributed by J.Andreina)
Moved to 2.6.1
(cherry picked from commit 84bf71295a5e52b2a7bb69440a885a25bc75f544)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4d94bc1d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4d94bc1d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4d94bc1d
Branch: refs/heads/branch-2.7
Commit: 4d94bc1d95c0604e76e3d97683d713e084d2f99d
Parents: ca3215a
Author: Vinayakumar B <vi...@apache.org>
Authored: Fri Aug 14 16:13:30 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Fri Aug 14 16:15:10 2015 +0530
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4d94bc1d/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index fca9f75..b35cc05 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -128,9 +128,6 @@ Release 2.7.1 - 2015-07-06
HDFS-5215. dfs.datanode.du.reserved is not considered while computing
available space ( Brahma Reddy Battula via Yongjun Zhang)
- HDFS-8270. create() always retried with hardcoded timeout when file already
- exists with open lease (J.Andreina via vinayakumarb)
-
HDFS-8523. Remove usage information on unsupported operation
"fsck -showprogress" from branch-2 (J.Andreina via vinayakumarb)
@@ -1209,6 +1206,9 @@ Release 2.6.1 - UNRELEASED
HDFS-7225. Remove stale block invalidation work when DN re-registers with
different UUID. (Zhe Zhang and Andrew Wang)
+ HDFS-8270. create() always retried with hardcoded timeout when file already
+ exists with open lease (J.Andreina via vinayakumarb)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
[3/4] hadoop git commit: HDFS-8270. create() always retried with
hardcoded timeout when file already exists with open lease (Contributed by
J.Andreina) Moved to 2.6.1
Posted by vi...@apache.org.
HDFS-8270. create() always retried with hardcoded timeout when file already exists with open lease (Contributed by J.Andreina)
Moved to 2.6.1
(cherry picked from commit 84bf71295a5e52b2a7bb69440a885a25bc75f544)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0b657438
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0b657438
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0b657438
Branch: refs/heads/branch-2
Commit: 0b6574380c7098345a05b5468f7fcf87fc21a21a
Parents: eef0526
Author: Vinayakumar B <vi...@apache.org>
Authored: Fri Aug 14 16:13:30 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Fri Aug 14 16:13:47 2015 +0530
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b657438/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 2fe056d..d9c1077 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -920,9 +920,6 @@ Release 2.7.1 - 2015-07-06
HDFS-8451. DFSClient probe for encryption testing interprets empty URI
property for "enabled". (Steve Loughran via xyao)
- HDFS-8270. create() always retried with hardcoded timeout when file already
- exists with open lease (J.Andreina via vinayakumarb)
-
HDFS-8523. Remove usage information on unsupported operation
"fsck -showprogress" from branch-2 (J.Andreina via vinayakumarb)
@@ -2014,6 +2011,9 @@ Release 2.6.1 - UNRELEASED
HDFS-7225. Remove stale block invalidation work when DN re-registers with
different UUID. (Zhe Zhang and Andrew Wang)
+ HDFS-8270. create() always retried with hardcoded timeout when file already
+ exists with open lease (J.Andreina via vinayakumarb)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES