addressing review

apache · Jan 4, 2022 · 49bff7c · 49bff7c
1 parent 8501c77
commit 49bff7c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
@@ -783,10 +783,10 @@ private void addAsyncProfilerServlet(ContextHandlerCollection contexts) throws I
       if (Files.notExists(tmpDir)) {
         Files.createDirectories(tmpDir);
       }
-      ServletContextHandler genCtx = new ServletContextHandler(contexts, "/prof-output");
+      ServletContextHandler genCtx = new ServletContextHandler(contexts, "/prof-output-hadoop");
       genCtx.addServlet(ProfileOutputServlet.class, "/*");
       genCtx.setResourceBase(tmpDir.toAbsolutePath().toString());
-      genCtx.setDisplayName("prof-output");
+      genCtx.setDisplayName("prof-output-hadoop");
     } else {
       addServlet("prof", "/prof", ProfilerDisabledServlet.class);
       LOG.info("ASYNC_PROFILER_HOME environment variable and async.profiler.home system property "

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java
@@ -110,7 +110,7 @@ public class ProfileServlet extends HttpServlet {
   private static final int DEFAULT_DURATION_SECONDS = 10;
   private static final AtomicInteger ID_GEN = new AtomicInteger(0);
 
-  static final String OUTPUT_DIR = System.getProperty("java.io.tmpdir") + "/prof-output";
+  static final String OUTPUT_DIR = System.getProperty("java.io.tmpdir") + "/prof-output-hadoop";
 
   private enum Event {
 
@@ -279,7 +279,7 @@ protected void doGet(final HttpServletRequest req, final HttpServletResponse res
             // set response and set refresh header to output location
             setResponseHeader(resp);
             resp.setStatus(HttpServletResponse.SC_ACCEPTED);
-            String relativeUrl = "/prof-output/" + outputFile.getName();
+            String relativeUrl = "/prof-output-hadoop/" + outputFile.getName();
             resp.getWriter().write("Started [" + event.getInternalName()
                 + "] profiling. This page will automatically redirect to " + relativeUrl + " after "
                 + duration + " seconds. "

diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/AsyncProfilerServlet.md b/hadoop-common-project/hadoop-common/src/site/markdown/AsyncProfilerServlet.md
@@ -28,6 +28,9 @@ HotSpot-specific APIs to collect stack traces and to track memory
 allocations. The profiler works with OpenJDK, Oracle JDK and other
 Java runtimes based on the HotSpot JVM.
 
+Hadoop profiler servlet supports Async Profiler major versions
+1.x and 2.x.
+
 Prerequisites
 -------------
 

diff --git a/...roject/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java b/...roject/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java
@@ -62,18 +62,27 @@ public void testQuery() throws Exception {
         (HttpURLConnection) new URL(baseUrl, "/prof").openConnection();
     assertEquals("GET", conn.getHeaderField(ProfileServlet.ACCESS_CONTROL_ALLOW_METHODS));
     assertNotNull(conn.getHeaderField(ProfileServlet.ACCESS_CONTROL_ALLOW_ORIGIN));
+    conn.disconnect();
   }
 
   @Test
   public void testRequestMethods() throws IOException {
+    HttpURLConnection connection = getConnection("PUT");
     assertEquals("Unexpected response code", HttpServletResponse.SC_METHOD_NOT_ALLOWED,
-        getConnection("PUT").getResponseCode());
+        connection.getResponseCode());
+    connection.disconnect();
+    connection = getConnection("POST");
     assertEquals("Unexpected response code", HttpServletResponse.SC_METHOD_NOT_ALLOWED,
-        getConnection("POST").getResponseCode());
+        connection.getResponseCode());
+    connection.disconnect();
+    connection = getConnection("DELETE");
     assertEquals("Unexpected response code", HttpServletResponse.SC_METHOD_NOT_ALLOWED,
-        getConnection("DELETE").getResponseCode());
+        connection.getResponseCode());
+    connection.disconnect();
+    connection = getConnection("GET");
     assertEquals("Unexpected response code", HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
-        getConnection("GET").getResponseCode());
+        connection.getResponseCode());
+    connection.disconnect();
   }
 
   private HttpURLConnection getConnection(final String method) throws IOException {