[hadoop] branch branch-3.2 updated: HDFS-16326. Simplify the code for DiskBalancer (#3663)

[tasanuma]

This is an automated email from the ASF dual-hosted git repository.

tasanuma pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.2 by this push:
     new abf8572  HDFS-16326. Simplify the code for DiskBalancer (#3663)
abf8572 is described below

commit abf8572a168fe3396daa9793bea1573064faa7f2
Author: litao <tomlees...@gmail.com>
AuthorDate: Fri Nov 19 10:37:10 2021 +0800

    HDFS-16326. Simplify the code for DiskBalancer (#3663)
    
    Reviewed-by: Viraj Jasani <vjas...@apache.org>
    (cherry picked from commit 965e3874e90f7ca7cf6d1418893340338eb8760f)
---
 .../java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
index 4c6af7a..8901c4e 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
@@ -808,7 +808,7 @@ public class DiskBalancer {
       long bytesToCopy = item.getBytesToCopy() - item.getBytesCopied();
       bytesToCopy = bytesToCopy +
           ((bytesToCopy * getBlockTolerancePercentage(item)) / 100);
-      return (blockSize <= bytesToCopy) ? true : false;
+      return blockSize <= bytesToCopy;
     }
 
     /**
@@ -833,7 +833,7 @@ public class DiskBalancer {
     private boolean isCloseEnough(DiskBalancerWorkItem item) {
       long temp = item.getBytesCopied() +
           ((item.getBytesCopied() * getBlockTolerancePercentage(item)) / 100);
-      return (item.getBytesToCopy() >= temp) ? false : true;
+      return item.getBytesToCopy() < temp;
     }
 
     /**

---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org