This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0d85515 HADOOP-17229. No updation of bytes received counter value
after response failure occurs in ABFS (#2264)
0d85515 is described below
commit 0d855159f0956af3070a1a173c8a6cb2c71a1ea3
Author: Mehakmeet Singh <[email protected]>
AuthorDate: Tue Sep 8 14:44:23 2020 +0530
HADOOP-17229. No updation of bytes received counter value after response
failure occurs in ABFS (#2264)
Contributed by Mehakmeet Singh
---
.../fs/azurebfs/services/AbfsRestOperation.java | 8 +++++--
.../fs/azurebfs/ITestAbfsNetworkStatistics.java | 28 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsRestOperation.java
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsRestOperation.java
index 936267a..88d5ad0 100644
---
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsRestOperation.java
+++
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsRestOperation.java
@@ -248,8 +248,12 @@ public class AbfsRestOperation {
httpOperation.processResponse(buffer, bufferOffset, bufferLength);
incrementCounter(AbfsStatistic.GET_RESPONSES, 1);
- incrementCounter(AbfsStatistic.BYTES_RECEIVED,
- httpOperation.getBytesReceived());
+ //Only increment bytesReceived counter when the status code is 2XX.
+ if (httpOperation.getStatusCode() >= HttpURLConnection.HTTP_OK
+ && httpOperation.getStatusCode() <= HttpURLConnection.HTTP_PARTIAL) {
+ incrementCounter(AbfsStatistic.BYTES_RECEIVED,
+ httpOperation.getBytesReceived());
+ }
} catch (IOException ex) {
if (ex instanceof UnknownHostException) {
LOG.warn(String.format("Unknown host name: %s. Retrying to resolve the
host name...", httpOperation.getUrl().getHost()));
diff --git
a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsNetworkStatistics.java
b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsNetworkStatistics.java
index 9d76fb0..f6ee7a9 100644
---
a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsNetworkStatistics.java
+++
b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsNetworkStatistics.java
@@ -27,6 +27,7 @@ import org.junit.Test;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileAlreadyExistsException;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.azurebfs.services.AbfsOutputStream;
@@ -291,4 +292,31 @@ public class ITestAbfsNetworkStatistics extends
AbstractAbfsIntegrationTest {
}
}
+ /**
+ * Testing bytes_received counter value when a response failure occurs.
+ */
+ @Test
+ public void testAbfsHttpResponseFailure() throws IOException {
+ describe("Test to check the values of bytes received counter when a "
+ + "response is failed");
+
+ AzureBlobFileSystem fs = getFileSystem();
+ Path responseFailurePath = path(getMethodName());
+ Map<String, Long> metricMap;
+ FSDataOutputStream out = null;
+
+ try {
+ //create an empty file
+ out = fs.create(responseFailurePath);
+ //Re-creating the file again on same path with false overwrite, this
+ // would cause a response failure with status code 409.
+ out = fs.create(responseFailurePath, false);
+ } catch (FileAlreadyExistsException faee) {
+ metricMap = fs.getInstrumentationMap();
+ // Assert after catching the 409 error to check the counter values.
+ assertAbfsStatistics(AbfsStatistic.BYTES_RECEIVED, 0, metricMap);
+ } finally {
+ IOUtils.cleanupWithLogger(LOG, out);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
