From c9393dd17f25ee62ceac0c66b96ce26b2789cc8a Mon Sep 17 00:00:00 2001
From: Inigo Goiri <inigoiri@apache.org>
Date: Fri, 24 May 2019 10:23:47 -0700
Subject: [PATCH] Revert "HDFS-14353. Erasure Coding: metrics xmitsInProgress
 become to negative. Contributed by maobaolong."

This reverts commit 1cb2eb0df30d4fbaa090c68022833063f3d225cc.
---
 .../server/datanode/erasurecode/ErasureCodingWorker.java    | 4 ----
 .../datanode/erasurecode/StripedBlockReconstructor.java     | 6 +-----
 .../server/datanode/erasurecode/StripedReconstructor.java   | 4 ----
 .../org/apache/hadoop/hdfs/TestReconstructStripedFile.java  | 6 ------
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java
index f4506cf470..f9063b7a89 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java
@@ -170,8 +170,4 @@ public final class ErasureCodingWorker {
     stripedReconstructionPool.shutdown();
     stripedReadPool.shutdown();
   }
-
-  public float getXmitWeight() {
-    return xmitWeight;
-  }
 }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockReconstructor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockReconstructor.java
index 1af2380886..29c0078e95 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockReconstructor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockReconstructor.java
@@ -67,11 +67,7 @@ class StripedBlockReconstructor extends StripedReconstructor
       LOG.warn("Failed to reconstruct striped block: {}", getBlockGroup(), e);
       getDatanode().getMetrics().incrECFailedReconstructionTasks();
     } finally {
-      float xmitWeight = getErasureCodingWorker().getXmitWeight();
-      // if the xmits is smaller than 1, the xmitsSubmitted should be set to 1
-      // because if it set to zero, we cannot to measure the xmits submitted
-      int xmitsSubmitted = Math.max((int) (getXmits() * xmitWeight), 1);
-      getDatanode().decrementXmitsInProgress(xmitsSubmitted);
+      getDatanode().decrementXmitsInProgress(getXmits());
       final DataNodeMetrics metrics = getDatanode().getMetrics();
       metrics.incrECReconstructionTasks();
       metrics.incrECReconstructionBytesRead(getBytesRead());
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java
index 4c8be827f4..a1f4c7ff55 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java
@@ -275,8 +275,4 @@ abstract class StripedReconstructor {
   DataNode getDatanode() {
     return datanode;
   }
-
-  public ErasureCodingWorker getErasureCodingWorker() {
-    return erasureCodingWorker;
-  }
 }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReconstructStripedFile.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReconstructStripedFile.java
index 0b490b5c3b..2abfff7876 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReconstructStripedFile.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReconstructStripedFile.java
@@ -514,8 +514,6 @@ public class TestReconstructStripedFile {
 
   @Test(timeout = 180000)
   public void testErasureCodingWorkerXmitsWeight() throws Exception {
-    testErasureCodingWorkerXmitsWeight(0.5f,
-        (int) (ecPolicy.getNumDataUnits() * 0.5f));
     testErasureCodingWorkerXmitsWeight(1f, ecPolicy.getNumDataUnits());
     testErasureCodingWorkerXmitsWeight(0f, 1);
     testErasureCodingWorkerXmitsWeight(10f, 10 * ecPolicy.getNumDataUnits());
@@ -569,10 +567,6 @@ public class TestReconstructStripedFile {
     } finally {
       barrier.await();
       DataNodeFaultInjector.set(oldInjector);
-      for (final DataNode curDn : cluster.getDataNodes()) {
-        GenericTestUtils.waitFor(() -> curDn.getXceiverCount() > 1, 10, 60000);
-        assertEquals(0, curDn.getXmitsInProgress());
-      }
     }
   }
 }