steveloughran commented on a change in pull request #2056:
URL: https://github.com/apache/hadoop/pull/2056#discussion_r439319323
##########
File path:
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsStatistic.java
##########
@@ -57,7 +57,23 @@
FILES_DELETED("files_deleted",
"Total number of files deleted from the object store."),
ERROR_IGNORED("error_ignored",
- "Errors caught and ignored.");
+ "Errors caught and ignored."),
+
+ //Network statistics.
+ CONNECTIONS_MADE("connections_made",
+ "Total number of times connection was made with Data store."),
+ SEND_REQUESTS("send_requests",
+ "Total number of times http requests was sent to the data store."),
+ GET_RESPONSE("get_response",
+ "Total number of times response was recorded after sending requests."),
Review comment:
"a response"
##########
File path:
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsStatistic.java
##########
@@ -57,7 +57,23 @@
FILES_DELETED("files_deleted",
"Total number of files deleted from the object store."),
ERROR_IGNORED("error_ignored",
- "Errors caught and ignored.");
+ "Errors caught and ignored."),
+
+ //Network statistics.
+ CONNECTIONS_MADE("connections_made",
+ "Total number of times connection was made with Data store."),
+ SEND_REQUESTS("send_requests",
+ "Total number of times http requests was sent to the data store."),
+ GET_RESPONSE("get_response",
Review comment:
responses
##########
File path:
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsStatistic.java
##########
@@ -57,7 +57,23 @@
FILES_DELETED("files_deleted",
"Total number of files deleted from the object store."),
ERROR_IGNORED("error_ignored",
- "Errors caught and ignored.");
+ "Errors caught and ignored."),
+
+ //Network statistics.
+ CONNECTIONS_MADE("connections_made",
+ "Total number of times connection was made with Data store."),
+ SEND_REQUESTS("send_requests",
+ "Total number of times http requests was sent to the data store."),
+ GET_RESPONSE("get_response",
+ "Total number of times response was recorded after sending requests."),
+ BYTES_SEND("bytes_send",
+ "Total bytes sent through http requests."),
Review comment:
how about "bytes sent from Azure Datalake"
##########
File path:
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsStatistic.java
##########
@@ -57,7 +57,23 @@
FILES_DELETED("files_deleted",
"Total number of files deleted from the object store."),
ERROR_IGNORED("error_ignored",
- "Errors caught and ignored.");
+ "Errors caught and ignored."),
+
+ //Network statistics.
+ CONNECTIONS_MADE("connections_made",
+ "Total number of times connection was made with Data store."),
+ SEND_REQUESTS("send_requests",
+ "Total number of times http requests was sent to the data store."),
Review comment:
"were sent"
##########
File path:
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsStatistic.java
##########
@@ -57,7 +57,23 @@
FILES_DELETED("files_deleted",
"Total number of files deleted from the object store."),
ERROR_IGNORED("error_ignored",
- "Errors caught and ignored.");
+ "Errors caught and ignored."),
+
+ //Network statistics.
+ CONNECTIONS_MADE("connections_made",
+ "Total number of times connection was made with Data store."),
+ SEND_REQUESTS("send_requests",
+ "Total number of times http requests was sent to the data store."),
+ GET_RESPONSE("get_response",
+ "Total number of times response was recorded after sending requests."),
+ BYTES_SEND("bytes_send",
Review comment:
"bytes sent"
##########
File path:
hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsNetworkStatistics.java
##########
@@ -0,0 +1,245 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.fs.azurebfs;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.junit.Test;
+
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.azurebfs.services.AbfsOutputStream;
+import org.apache.hadoop.fs.azurebfs.services.AbfsRestOperation;
+
+public class ITestAbfsNetworkStatistics extends AbstractAbfsIntegrationTest {
+
+ private static final Logger LOG =
+ LoggerFactory.getLogger(ITestAbfsNetworkStatistics.class);
+ private static final int LARGE_OPERATIONS = 10;
+
+ public ITestAbfsNetworkStatistics() throws Exception {
+ }
+
+ /**
+ * Testing connections_made, send_request and bytes_send statistics in
+ * {@link AbfsRestOperation}.
+ */
+ @Test
+ public void testAbfsHttpSendStatistics() throws IOException {
+ describe("Test to check correct values of statistics after Abfs http send "
+ + "request is done.");
+
+ AzureBlobFileSystem fs = getFileSystem();
+ Map<String, Long> metricMap;
+ Path sendRequestPath = path(getMethodName());
+ String testNetworkStatsString = "http_send";
+
+ /*
+ * Creating AbfsOutputStream will result in 1 connection made and 1 send
+ * request.
+ */
+ try (AbfsOutputStream out = createAbfsOutputStreamWithFlushEnabled(fs,
+ sendRequestPath)) {
+ out.write(testNetworkStatsString.getBytes());
+
+ /*
+ * Flushes all outstanding data (i.e. the current unfinished packet)
+ * from the client into the service on all DataNode replicas.
+ */
+ out.hflush();
+
+ metricMap = fs.getInstrumentationMap();
+
+ /*
+ * Testing the network stats with 1 write operation.
+ *
+ * connections_made : 3(getFileSystem()) + 1(AbfsOutputStream) +
2(flush).
+ * send_requests : 1(getFileSystem()) + 1(AbfsOutputStream) + 2(flush).
+ * bytes_send : bytes wrote in AbfsOutputStream.
+ */
+ assertAbfsStatistics(AbfsStatistic.CONNECTIONS_MADE, 6, metricMap);
+ assertAbfsStatistics(AbfsStatistic.SEND_REQUESTS, 4, metricMap);
+ assertAbfsStatistics(AbfsStatistic.BYTES_SEND,
+ testNetworkStatsString.getBytes().length, metricMap);
+
+ }
+
+ /*
+ * Re-initializing the FS for the next test.
+ *
+ * 2 connections are made during initialize. Hence, initial value of
+ * connections_made = 2.
+ */
+ fs.initialize(fs.getUri(), fs.getConf());
+
+ try (AbfsOutputStream out = createAbfsOutputStreamWithFlushEnabled(fs,
+ sendRequestPath)) {
+
+ for (int i = 0; i < LARGE_OPERATIONS; i++) {
+ out.write(testNetworkStatsString.getBytes());
+
+ /*
+ * 1 flush call would create 2 connections and 2 send requests.
+ * when hflush() is called it will essentially trigger append() and
+ * flush() inside AbfsRestOperation. Both of which calls
+ * executeHttpOperation() method which creates a connection and sends
+ * requests.
+ */
+ out.hflush();
+ }
+
+ metricMap = fs.getInstrumentationMap();
+
+ /*
+ * Testing the network stats with Large amount of bytes sent.
+ *
+ * connections made : 2(initialize) + 1(AbfsOutputStream) +
+ * LARGE_OPERATIONS * 2(flush).
+ * send requests : 1(AbfsOutputStream) + LARGE_OPERATIONS * 2(flush).
+ * bytes send : LARGE_OPERATIONS * (bytes wrote each time).
+ *
+ */
+ assertAbfsStatistics(AbfsStatistic.CONNECTIONS_MADE,
+ 3 + LARGE_OPERATIONS * 2, metricMap);
+ assertAbfsStatistics(AbfsStatistic.SEND_REQUESTS,
+ 1 + LARGE_OPERATIONS * 2, metricMap);
+ assertAbfsStatistics(AbfsStatistic.BYTES_SEND,
+ LARGE_OPERATIONS * (testNetworkStatsString.getBytes().length),
+ metricMap);
+
+ }
+
+ }
+
+ /**
+ * Testing get_response and bytes_received in {@link AbfsRestOperation}.
+ */
+ @Test
+ public void testAbfsHttpResponseStatistics() throws IOException {
+ describe("Test to check correct values of statistics after Http "
+ + "Response is processed.");
+
+ AzureBlobFileSystem fs = getFileSystem();
+ Path getResponsePath = path(getMethodName());
+ Map<String, Long> metricMap;
+ String testResponseString = "some response";
+
+ FSDataOutputStream out = null;
+ FSDataInputStream in = null;
+ try {
+
+ /*
+ * Creating a File and writing some bytes in it.
+ *
+ * get_response : 3(getFileSystem) + 1(OutputStream creation) + 2
+ * (Writing data in Data store).
+ *
+ */
+ out = fs.create(getResponsePath);
+ out.write(testResponseString.getBytes());
+ out.hflush();
+
+ // open would require 1 get response.
+ in = fs.open(getResponsePath);
+ // read would require 1 get response and also get the bytes received.
+ int result = in.read();
+
+ // Confirming read isn't -1.
+ LOG.info("Result of read operation : {}", result);
+
+ metricMap = fs.getInstrumentationMap();
+
+ /*
+ * Testing values of statistics after writing and reading a buffer.
+ *
+ * get_response - 6(above operations) + 1(open()) + 1 (read()).
+ * bytes_received - bytes send in the file.
+ */
+ assertAbfsStatistics(AbfsStatistic.GET_RESPONSE, 8, metricMap);
+ // Testing that bytes received is equal to bytes sent.
+ long bytesSend = metricMap.get(AbfsStatistic.BYTES_SEND.getStatName());
+ assertAbfsStatistics(AbfsStatistic.BYTES_RECEIVED, bytesSend, metricMap);
+
+ } finally {
+ IOUtils.cleanupWithLogger(LOG, out, in);
+ }
+
+ /*
+ * Re-initializing FS.
+ * get_response required : 2.
+ */
+ fs.initialize(fs.getUri(), fs.getConf());
Review comment:
I'd be reluctant to re-init the same FS. better to create a new instance
Even better, save the values as they are now, then assert the diff between
the later values and these are as expected
##########
File path:
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
##########
@@ -143,7 +144,8 @@
private final IdentityTransformerInterface identityTransformer;
private final AbfsPerfTracker abfsPerfTracker;
- public AzureBlobFileSystemStore(URI uri, boolean isSecureScheme,
Configuration configuration)
+ public AzureBlobFileSystemStore(URI uri, boolean isSecureScheme,
+ Configuration configuration, AbfsCounters instrumentation)
Review comment:
indentation?
##########
File path:
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsStatistic.java
##########
@@ -57,7 +57,23 @@
FILES_DELETED("files_deleted",
"Total number of files deleted from the object store."),
ERROR_IGNORED("error_ignored",
- "Errors caught and ignored.");
+ "Errors caught and ignored."),
+
+ //Network statistics.
+ CONNECTIONS_MADE("connections_made",
+ "Total number of times connection was made with Data store."),
+ SEND_REQUESTS("send_requests",
+ "Total number of times http requests was sent to the data store."),
+ GET_RESPONSE("get_response",
+ "Total number of times response was recorded after sending requests."),
+ BYTES_SEND("bytes_send",
+ "Total bytes sent through http requests."),
+ BYTES_RECEIVED("bytes_received",
+ "Total bytes received in response to the requests sent."),
Review comment:
how about "bytes received from Azure Datalake"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
