Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-11216. Add remoteBytesRead counter metrics for erasure coding reconstruction task. Contributed by Sammi Chen

This commit is contained in:
Kai Zheng 2016-12-22 14:18:54 +08:00
parent ae401539ea
commit 56a13a6a59
6 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java
View File

@ -236,6 +236,13 @@ public class MetricsAsserts {
return captor.getValue();
}
public static long getLongCounterWithoutCheck(String name,
MetricsRecordBuilder rb) {
ArgumentCaptor<Long> captor = ArgumentCaptor.forClass(Long.class);
verify(rb, atLeast(0)).addCounter(eqName(info(name, "")), captor.capture());
return captor.getValue();
}
public static String getStringMetric(String name, MetricsRecordBuilder rb) {
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
verify(rb, atLeast(0)).tag(eqName(info(name, "")), captor.capture());

11
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockReader.java
View File

@ -65,6 +65,7 @@ class StripedBlockReader {
private final DatanodeInfo source;
private BlockReader blockReader;
private ByteBuffer buffer;
private boolean isLocal;
StripedBlockReader(StripedReader stripedReader, DataNode datanode,
Configuration conf, short index, ExtendedBlock block,
@ -76,6 +77,7 @@ class StripedBlockReader {
this.index = index;
this.source = source;
this.block = block;
this.isLocal = false;
BlockReader tmpBlockReader = createBlockReader(offsetInBlock);
if (tmpBlockReader != null) {
@ -116,10 +118,13 @@ class StripedBlockReader {
*
* TODO: add proper tracer
*/
Peer peer = newConnectedPeer(block, dnAddr, blockToken, source);
if (peer.isLocal()) {
this.isLocal = true;
}
return BlockReaderRemote.newBlockReader(
"dummy", block, blockToken, offsetInBlock,
block.getNumBytes() - offsetInBlock, true,
"", newConnectedPeer(block, dnAddr, blockToken, source), source,
block.getNumBytes() - offsetInBlock, true, "", peer, source,
null, stripedReader.getCachingStrategy(), datanode.getTracer(), -1);
} catch (IOException e) {
LOG.info("Exception while creating remote block reader, datanode {}",
@ -187,7 +192,7 @@ class StripedBlockReader {
break;
}
n += nread;
stripedReader.getReconstructor().incrBytesRead(nread);
stripedReader.getReconstructor().incrBytesRead(isLocal, nread);
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockReconstructor.java
View File

@ -70,6 +70,7 @@ class StripedBlockReconstructor extends StripedReconstructor
final DataNodeMetrics metrics = getDatanode().getMetrics();
metrics.incrECReconstructionTasks();
metrics.incrECReconstructionBytesRead(getBytesRead());
metrics.incrECReconstructionRemoteBytesRead(getRemoteBytesRead());
metrics.incrECReconstructionBytesWritten(getBytesWritten());
getStripedReader().close();
stripedWriter.close();

14
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java
View File

@ -118,6 +118,7 @@ abstract class StripedReconstructor {
// metrics
private AtomicLong bytesRead = new AtomicLong(0);
private AtomicLong bytesWritten = new AtomicLong(0);
private AtomicLong remoteBytesRead = new AtomicLong(0);
StripedReconstructor(ErasureCodingWorker worker,
StripedReconstructionInfo stripedReconInfo) {
@ -138,8 +139,13 @@ abstract class StripedReconstructor {
positionInBlock = 0L;
}
public void incrBytesRead(long delta) {
bytesRead.addAndGet(delta);
public void incrBytesRead(boolean local, long delta) {
if (local) {
bytesRead.addAndGet(delta);
} else {
bytesRead.addAndGet(delta);
remoteBytesRead.addAndGet(delta);
}
}
public void incrBytesWritten(long delta) {
@ -150,6 +156,10 @@ abstract class StripedReconstructor {
return bytesRead.get();
}
public long getRemoteBytesRead() {
return remoteBytesRead.get();
}
public long getBytesWritten() {
return bytesWritten.get();
}

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeMetrics.java
View File

@ -140,6 +140,8 @@ public class DataNodeMetrics {
MutableCounterLong ecReconstructionBytesRead;
@Metric("Bytes written by erasure coding worker")
MutableCounterLong ecReconstructionBytesWritten;
@Metric("Bytes remote read by erasure coding worker")
MutableCounterLong ecReconstructionRemoteBytesRead;
final MetricsRegistry registry = new MetricsRegistry("datanode");
final String name;
@ -459,6 +461,10 @@ public class DataNodeMetrics {
ecReconstructionBytesRead.incr(bytes);
}
public void incrECReconstructionRemoteBytesRead(long bytes) {
ecReconstructionRemoteBytesRead.incr(bytes);
}
public void incrECReconstructionBytesWritten(long bytes) {
ecReconstructionBytesWritten.incr(bytes);
}

21
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeErasureCodingMetrics.java
View File

@ -37,6 +37,7 @@ import org.apache.hadoop.hdfs.server.namenode.ErasureCodingPolicyManager;
import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import static org.apache.hadoop.test.MetricsAsserts.getLongCounter;
import static org.apache.hadoop.test.MetricsAsserts.getLongCounterWithoutCheck;
import static org.apache.hadoop.test.MetricsAsserts.getMetrics;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@ -98,6 +99,8 @@ public class TestDataNodeErasureCodingMetrics {
blockGroupSize, getLongMetric("EcReconstructionBytesRead"));
Assert.assertEquals("EcReconstructionBytesWritten should be ",
blockSize, getLongMetric("EcReconstructionBytesWritten"));
Assert.assertEquals("EcReconstructionRemoteBytesRead should be ",
0, getLongMetricWithoutCheck("EcReconstructionRemoteBytesRead"));
}
// A partial block, reconstruct the partial block
@ -110,6 +113,8 @@ public class TestDataNodeErasureCodingMetrics {
fileLen, getLongMetric("EcReconstructionBytesRead"));
Assert.assertEquals("EcReconstructionBytesWritten should be ",
fileLen, getLongMetric("EcReconstructionBytesWritten"));
Assert.assertEquals("EcReconstructionRemoteBytesRead should be ",
0, getLongMetricWithoutCheck("EcReconstructionRemoteBytesRead"));
}
// 1 full block + 5 partial block, reconstruct the full block
@ -121,8 +126,10 @@ public class TestDataNodeErasureCodingMetrics {
Assert.assertEquals("ecReconstructionBytesRead should be ",
cellSize * dataBlocks + cellSize + cellSize / 10,
getLongMetric("EcReconstructionBytesRead"));
Assert.assertEquals("ecReconstructionBytesWritten should be ",
Assert.assertEquals("EcReconstructionBytesWritten should be ",
blockSize, getLongMetric("EcReconstructionBytesWritten"));
Assert.assertEquals("EcReconstructionRemoteBytesRead should be ",
0, getLongMetricWithoutCheck("EcReconstructionRemoteBytesRead"));
}
// 1 full block + 5 partial block, reconstruct the partial block
@ -137,6 +144,8 @@ public class TestDataNodeErasureCodingMetrics {
Assert.assertEquals("ecReconstructionBytesWritten should be ",
cellSize + cellSize / 10,
getLongMetric("EcReconstructionBytesWritten"));
Assert.assertEquals("EcReconstructionRemoteBytesRead should be ",
0, getLongMetricWithoutCheck("EcReconstructionRemoteBytesRead"));
}
private long getLongMetric(String metricName) {
@ -149,6 +158,16 @@ public class TestDataNodeErasureCodingMetrics {
return metricValue;
}
private long getLongMetricWithoutCheck(String metricName) {
long metricValue = 0;
// Add all reconstruction metric value from all data nodes
for (DataNode dn : cluster.getDataNodes()) {
MetricsRecordBuilder rb = getMetrics(dn.getMetrics().name());
metricValue += getLongCounterWithoutCheck(metricName, rb);
}
return metricValue;
}
private void doTest(String fileName, int fileLen,
int deadNodeIndex) throws Exception {
assertTrue(fileLen > 0);