This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new c9c471e HDFS-15439. Setting dfs.mover.retry.max.attempts to negative
value will retry forever. Contributed by AMC-team.
c9c471e is described below
commit c9c471e04ede70c38fe4616a808cbee1c1211d85
Author: Ayush Saxena <ayushsax...@apache.org>
AuthorDate: Sat Aug 15 15:07:08 2020 +0530
HDFS-15439. Setting dfs.mover.retry.max.attempts to negative value will
retry forever. Contributed by AMC-team.
(cherry picked from commit e3d1966f58ad473b8e852aa2b11c8ed2b434d9e4)
---
.../main/java/org/apache/hadoop/hdfs/server/mover/Mover.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/mover/Mover.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/mover/Mover.java
index ea8daa3..51ae512 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/mover/Mover.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/mover/Mover.java
@@ -134,9 +134,17 @@ public class Mover {
final int maxNoMoveInterval = conf.getInt(
DFSConfigKeys.DFS_MOVER_MAX_NO_MOVE_INTERVAL_KEY,
DFSConfigKeys.DFS_MOVER_MAX_NO_MOVE_INTERVAL_DEFAULT);
- this.retryMaxAttempts = conf.getInt(
+ final int maxAttempts = conf.getInt(
DFSConfigKeys.DFS_MOVER_RETRY_MAX_ATTEMPTS_KEY,
DFSConfigKeys.DFS_MOVER_RETRY_MAX_ATTEMPTS_DEFAULT);
+ if (maxAttempts >= 0) {
+ this.retryMaxAttempts = maxAttempts;
+ } else {
+ LOG.warn(DFSConfigKeys.DFS_MOVER_RETRY_MAX_ATTEMPTS_KEY + " is "
+ + "configured with a negative value, using default value of "
+ + DFSConfigKeys.DFS_MOVER_RETRY_MAX_ATTEMPTS_DEFAULT);
+ this.retryMaxAttempts =
DFSConfigKeys.DFS_MOVER_RETRY_MAX_ATTEMPTS_DEFAULT;
+ }
this.retryCount = retryCount;
this.dispatcher = new Dispatcher(nnc, Collections.<String> emptySet(),
Collections.<String> emptySet(), movedWinWidth, moverThreads, 0,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
