This is an automated email from the ASF dual-hosted git repository.
msingh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new be8a2fc HDDS-3549. TestKeyInputStream#testSeek fails intermittently.
(#899)
be8a2fc is described below
commit be8a2fcc8773dece81912814ad7b6a4b72aa2718
Author: Lokesh Jain <[email protected]>
AuthorDate: Wed May 13 11:19:39 2020 +0530
HDDS-3549. TestKeyInputStream#testSeek fails intermittently. (#899)
---
.../hadoop/hdds/scm/XceiverClientMetrics.java | 2 +-
.../ozone/client/rpc/TestBlockOutputStream.java | 157 +++++++++++----------
.../ozone/client/rpc/TestKeyInputStream.java | 2 +-
.../ozone/client/rpc/TestWatchForCommit.java | 28 ++--
4 files changed, 95 insertions(+), 94 deletions(-)
diff --git
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientMetrics.java
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientMetrics.java
index 5307646..89a2592 100644
---
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientMetrics.java
+++
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientMetrics.java
@@ -96,7 +96,7 @@ public class XceiverClientMetrics {
containerOpsLatency[type.ordinal()].add(latencyNanos);
}
- public long getContainerOpsMetrics(ContainerProtos.Type type) {
+ public long getPendingContainerOpCountMetrics(ContainerProtos.Type type) {
return pendingOpsArray[type.ordinal()].value();
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java
index 8f2010f..9c8f4d7 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java
@@ -124,9 +124,9 @@ public class TestBlockOutputStream {
ContainerProtos.Type.WriteChunk);
long putBlockCount = metrics.getContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
- long pendingWriteChunkCount = metrics.getContainerOpsMetrics(
+ long pendingWriteChunkCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.WriteChunk);
- long pendingPutBlockCount = metrics.getContainerOpsMetrics(
+ long pendingPutBlockCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
long totalOpCount = metrics.getTotalOpCount();
String keyName = getKeyName();
@@ -157,10 +157,11 @@ public class TestBlockOutputStream {
Assert.assertEquals(0, blockOutputStream.getTotalAckDataLength());
Assert.assertEquals(pendingWriteChunkCount,
XceiverClientManager.getXceiverClientMetrics()
- .getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
+ .getPendingContainerOpCountMetrics(
+ ContainerProtos.Type.WriteChunk));
Assert.assertEquals(pendingPutBlockCount,
XceiverClientManager.getXceiverClientMetrics()
- .getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
// commitIndex2FlushedData Map will be empty here
Assert.assertTrue(
@@ -171,10 +172,10 @@ public class TestBlockOutputStream {
key.flush();
// flush is a sync call, all pending operations will complete
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
// we have just written data less than a chunk size, the data will just sit
// in the buffer, with only one buffer being allocated in the buffer pool
@@ -194,10 +195,10 @@ public class TestBlockOutputStream {
// now close the stream, It will update the ack length after watchForCommit
key.close();
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertEquals(writeChunkCount + 1,
metrics.getContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
Assert.assertEquals(putBlockCount + 2,
@@ -222,9 +223,9 @@ public class TestBlockOutputStream {
ContainerProtos.Type.WriteChunk);
long putBlockCount = metrics.getContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
- long pendingWriteChunkCount = metrics.getContainerOpsMetrics(
+ long pendingWriteChunkCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.WriteChunk);
- long pendingPutBlockCount = metrics.getContainerOpsMetrics(
+ long pendingPutBlockCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
long totalOpCount = metrics.getTotalOpCount();
String keyName = getKeyName();
@@ -235,10 +236,10 @@ public class TestBlockOutputStream {
ContainerTestHelper.getFixedLengthString(keyString, dataLength)
.getBytes(UTF_8);
key.write(data1);
- Assert.assertEquals(pendingWriteChunkCount + 2,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount + 1,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount + 2, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount + 1, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertTrue(key.getOutputStream() instanceof KeyOutputStream);
KeyOutputStream keyOutputStream = (KeyOutputStream)key.getOutputStream();
@@ -267,10 +268,10 @@ public class TestBlockOutputStream {
key.flush();
Assert.assertEquals(1, keyOutputStream.getStreamEntries().size());
// flush is a sync call, all pending operations will complete
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
// Since the data in the buffer is already flushed, flush here will have
// no impact on the counters and data structures
@@ -295,10 +296,10 @@ public class TestBlockOutputStream {
.assertEquals(0,
blockOutputStream.getBufferPool().computeBufferData());
Assert.assertEquals(dataLength, blockOutputStream.getTotalAckDataLength());
Assert.assertNull(blockOutputStream.getCommitIndex2flushedDataMap());
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertEquals(writeChunkCount + 2,
metrics.getContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
Assert.assertEquals(putBlockCount + 2,
@@ -317,9 +318,9 @@ public class TestBlockOutputStream {
ContainerProtos.Type.WriteChunk);
long putBlockCount = metrics.getContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
- long pendingWriteChunkCount = metrics.getContainerOpsMetrics(
+ long pendingWriteChunkCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.WriteChunk);
- long pendingPutBlockCount = metrics.getContainerOpsMetrics(
+ long pendingPutBlockCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
long totalOpCount = metrics.getTotalOpCount();
String keyName = getKeyName();
@@ -330,10 +331,10 @@ public class TestBlockOutputStream {
ContainerTestHelper.getFixedLengthString(keyString, dataLength)
.getBytes(UTF_8);
key.write(data1);
- Assert.assertEquals(pendingWriteChunkCount + 1,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount + 1, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertTrue(key.getOutputStream() instanceof KeyOutputStream);
KeyOutputStream keyOutputStream = (KeyOutputStream)key.getOutputStream();
@@ -366,10 +367,10 @@ public class TestBlockOutputStream {
metrics.getContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
Assert.assertEquals(putBlockCount + 1,
metrics.getContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertEquals(2, blockOutputStream.getBufferPool().getSize());
Assert.assertEquals(dataLength, blockOutputStream.getWrittenDataLength());
@@ -390,10 +391,10 @@ public class TestBlockOutputStream {
.assertEquals(0,
blockOutputStream.getBufferPool().computeBufferData());
Assert.assertEquals(dataLength, blockOutputStream.getTotalAckDataLength());
Assert.assertNull(blockOutputStream.getCommitIndex2flushedDataMap());
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertEquals(writeChunkCount + 2,
metrics.getContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
Assert.assertEquals(putBlockCount + 2,
@@ -412,9 +413,9 @@ public class TestBlockOutputStream {
ContainerProtos.Type.WriteChunk);
long putBlockCount = metrics.getContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
- long pendingWriteChunkCount = metrics.getContainerOpsMetrics(
+ long pendingWriteChunkCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.WriteChunk);
- long pendingPutBlockCount = metrics.getContainerOpsMetrics(
+ long pendingPutBlockCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
long totalOpCount = metrics.getTotalOpCount();
String keyName = getKeyName();
@@ -425,10 +426,10 @@ public class TestBlockOutputStream {
ContainerTestHelper.getFixedLengthString(keyString, dataLength)
.getBytes(UTF_8);
key.write(data1);
- Assert.assertEquals(pendingWriteChunkCount + 2,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount + 1,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount + 2, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount + 1, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertTrue(key.getOutputStream() instanceof KeyOutputStream);
KeyOutputStream keyOutputStream = (KeyOutputStream)key.getOutputStream();
@@ -460,10 +461,10 @@ public class TestBlockOutputStream {
Assert.assertEquals(0, blockOutputStream.getTotalAckDataLength());
Assert.assertEquals(1, keyOutputStream.getStreamEntries().size());
key.close();
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertEquals(writeChunkCount + 3,
metrics.getContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
Assert.assertEquals(putBlockCount + 2,
@@ -488,9 +489,9 @@ public class TestBlockOutputStream {
ContainerProtos.Type.WriteChunk);
long putBlockCount = metrics.getContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
- long pendingWriteChunkCount = metrics.getContainerOpsMetrics(
+ long pendingWriteChunkCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.WriteChunk);
- long pendingPutBlockCount = metrics.getContainerOpsMetrics(
+ long pendingPutBlockCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
long totalOpCount = metrics.getTotalOpCount();
String keyName = getKeyName();
@@ -504,11 +505,11 @@ public class TestBlockOutputStream {
// since its hitting the full bufferCondition, it will call watchForCommit
// and completes atleast putBlock for first flushSize worth of data
+ Assert.assertTrue(metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk)
+ <= pendingWriteChunkCount + 2);
Assert.assertTrue(
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk)
- <= pendingWriteChunkCount + 2);
- Assert.assertTrue(
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock)
+
metrics.getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock)
<= pendingPutBlockCount + 1);
Assert.assertTrue(key.getOutputStream() instanceof KeyOutputStream);
KeyOutputStream keyOutputStream = (KeyOutputStream)key.getOutputStream();
@@ -542,10 +543,10 @@ public class TestBlockOutputStream {
// the map.
key.flush();
Assert.assertEquals(1, keyOutputStream.getStreamEntries().size());
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
// Since the data in the buffer is already flushed, flush here will have
// no impact on the counters and data structures
@@ -560,10 +561,10 @@ public class TestBlockOutputStream {
// now close the stream, It will update the ack length after watchForCommit
key.close();
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertEquals(writeChunkCount + 4,
metrics.getContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
Assert.assertEquals(putBlockCount + 3,
@@ -588,9 +589,9 @@ public class TestBlockOutputStream {
ContainerProtos.Type.WriteChunk);
long putBlockCount = metrics.getContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
- long pendingWriteChunkCount = metrics.getContainerOpsMetrics(
+ long pendingWriteChunkCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.WriteChunk);
- long pendingPutBlockCount = metrics.getContainerOpsMetrics(
+ long pendingPutBlockCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
long totalOpCount = metrics.getTotalOpCount();
String keyName = getKeyName();
@@ -606,11 +607,11 @@ public class TestBlockOutputStream {
// since its hitting the full bufferCondition, it will call watchForCommit
// and completes atleast putBlock for first flushSize worth of data
+ Assert.assertTrue(metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk)
+ <= pendingWriteChunkCount + 2);
Assert.assertTrue(
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk)
- <= pendingWriteChunkCount + 2);
- Assert.assertTrue(
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock)
+
metrics.getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock)
<= pendingPutBlockCount + 1);
Assert.assertEquals(writeChunkCount + 4,
metrics.getContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
@@ -645,10 +646,10 @@ public class TestBlockOutputStream {
// the map.
key.flush();
Assert.assertEquals(1, keyOutputStream.getStreamEntries().size());
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
// Since the data in the buffer is already flushed, flush here will have
// no impact on the counters and data structures
@@ -668,10 +669,10 @@ public class TestBlockOutputStream {
// make sure the bufferPool is empty
Assert
.assertEquals(0,
blockOutputStream.getBufferPool().computeBufferData());
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertEquals(writeChunkCount + 5,
metrics.getContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
Assert.assertEquals(putBlockCount + 4,
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestKeyInputStream.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestKeyInputStream.java
index 75b6055..f48a7b1 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestKeyInputStream.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestKeyInputStream.java
@@ -257,7 +257,7 @@ public class TestKeyInputStream {
// Seek operation should not result in any readChunk operation.
Assert.assertEquals(readChunkCount, metrics
- .getContainerOpsMetrics(ContainerProtos.Type.ReadChunk));
+ .getContainerOpCountMetrics(ContainerProtos.Type.ReadChunk));
byte[] readData = new byte[chunkSize];
keyInputStream.read(readData, 0, chunkSize);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java
index 01dab0e..3e93b24 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java
@@ -152,9 +152,9 @@ public class TestWatchForCommit {
ContainerProtos.Type.WriteChunk);
long putBlockCount = metrics.getContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
- long pendingWriteChunkCount = metrics.getContainerOpsMetrics(
+ long pendingWriteChunkCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.WriteChunk);
- long pendingPutBlockCount = metrics.getContainerOpsMetrics(
+ long pendingPutBlockCount = metrics.getPendingContainerOpCountMetrics(
ContainerProtos.Type.PutBlock);
long totalOpCount = metrics.getTotalOpCount();
String keyName = getKeyName();
@@ -167,11 +167,11 @@ public class TestWatchForCommit {
key.write(data1);
// since its hitting the full bufferCondition, it will call watchForCommit
// and completes atleast putBlock for first flushSize worth of data
+ Assert.assertTrue(metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk)
+ <= pendingWriteChunkCount + 2);
Assert.assertTrue(
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk)
- <= pendingWriteChunkCount + 2);
- Assert.assertTrue(
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock)
+
metrics.getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock)
<= pendingPutBlockCount + 1);
Assert.assertEquals(writeChunkCount + 4,
metrics.getContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
@@ -205,10 +205,10 @@ public class TestWatchForCommit {
// Now do a flush. This will flush the data and update the flush length and
// the map.
key.flush();
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertEquals(writeChunkCount + 5,
metrics.getContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
Assert.assertEquals(putBlockCount + 3,
@@ -253,10 +253,10 @@ public class TestWatchForCommit {
.assertEquals(dataLength, blockOutputStream.getTotalAckDataLength());
Assert.assertNull(blockOutputStream.getCommitIndex2flushedDataMap());
Assert.assertEquals(0, keyOutputStream.getStreamEntries().size());
- Assert.assertEquals(pendingWriteChunkCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.WriteChunk));
- Assert.assertEquals(pendingPutBlockCount,
- metrics.getContainerOpsMetrics(ContainerProtos.Type.PutBlock));
+ Assert.assertEquals(pendingWriteChunkCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
+ Assert.assertEquals(pendingPutBlockCount, metrics
+ .getPendingContainerOpCountMetrics(ContainerProtos.Type.PutBlock));
Assert.assertEquals(writeChunkCount + 14,
metrics.getContainerOpCountMetrics(ContainerProtos.Type.WriteChunk));
Assert.assertEquals(putBlockCount + 8,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
