Erasure Coding: metrics xmitsInProgress become to negative. Contributed by maobaolong and Toshihiko Uchida.
This commit is contained in:
parent
44de193bec
commit
d6fc482a54
|
@ -170,4 +170,8 @@ public final class ErasureCodingWorker {
|
|||
stripedReconstructionPool.shutdown();
|
||||
stripedReadPool.shutdown();
|
||||
}
|
||||
|
||||
public float getXmitWeight() {
|
||||
return xmitWeight;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -67,7 +67,11 @@ class StripedBlockReconstructor extends StripedReconstructor
|
|||
LOG.warn("Failed to reconstruct striped block: {}", getBlockGroup(), e);
|
||||
getDatanode().getMetrics().incrECFailedReconstructionTasks();
|
||||
} finally {
|
||||
getDatanode().decrementXmitsInProgress(getXmits());
|
||||
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);
|
||||
final DataNodeMetrics metrics = getDatanode().getMetrics();
|
||||
metrics.incrECReconstructionTasks();
|
||||
metrics.incrECReconstructionBytesRead(getBytesRead());
|
||||
|
|
|
@ -275,4 +275,8 @@ abstract class StripedReconstructor {
|
|||
DataNode getDatanode() {
|
||||
return datanode;
|
||||
}
|
||||
|
||||
public ErasureCodingWorker getErasureCodingWorker() {
|
||||
return erasureCodingWorker;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -514,6 +514,8 @@ 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());
|
||||
|
@ -567,6 +569,10 @@ 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());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue