Merge branch 'apache:trunk' into HADOOP-19415-PART7

Author: slfan1989

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/protocolPB/AsyncRpcProtocolPBUtil.java

@@ -26,6 +26,7 @@
 import org.apache.hadoop.ipc.Client;
 import org.apache.hadoop.ipc.ProtobufRpcEngine2;
 import org.apache.hadoop.ipc.ProtobufRpcEngineCallback2;
+import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.ipc.internal.ShadedProtobufHelper;
 import org.apache.hadoop.thirdparty.protobuf.Message;
 import org.apache.hadoop.util.concurrent.AsyncGet;
@@ -93,6 +94,8 @@ public static <T, R> R asyncIpcClient(
       }
       try {
         T res = asyncReqMessage.get(-1, null);
+        LOG.debug("Async IPC Request, Call={}, CallerContext={}, Result={}",
+            Server.getCurCall().get(), CallerContext.getCurrent(), res);
         return response.apply(res);
       } catch (Exception ex) {
         throw warpCompletionException(ex);

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ThreadLocalContext.java

@@ -75,6 +75,7 @@ public ThreadLocalContext() {
    * that the task execution reflects the state of the original calling thread.
    */
   public void transfer() {
+    Server.getCurCall().set(null);
     if (call != null) {
       Server.getCurCall().set(call);
     }

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java

@@ -168,7 +168,7 @@ protected void initializeWebApp(Configuration conf) throws IOException {
         ClientRMProxy.createRMProxy(conf, ApplicationClientProtocol.class);
     // NOTE: there should be a .at(InetSocketAddress)
     WebApps
-        .$for("jobhistory", HistoryClientService.class, this, "ws")
+        .$for("jobhistory", HistoryClientService.class, this, "hs-ws")
         .with(conf)
         .withHttpSpnegoKeytabKey(
             JHAdminConfig.MR_WEBAPP_SPNEGO_KEYTAB_FILE_KEY)

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsWebApp.java

@@ -44,6 +44,7 @@ public void setup() {
     bind(HistoryContext.class).toInstance(history);
     route("/", HsController.class);
     route("/app", HsController.class);
+    route("/jobhistory", HsController.class);
     route(pajoin("/job", JOB_ID), HsController.class, "job");
     route(pajoin("/conf", JOB_ID), HsController.class, "conf");
     routeWithoutDefaultView(pajoin("/downloadconf", JOB_ID),

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml

@@ -270,6 +270,13 @@
             <groupId>ro.isdc.wro4j</groupId>
             <artifactId>wro4j-maven-plugin</artifactId>
             <version>1.8.0</version>
+            <dependencies>
+              <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>4.11.0</version>
+              </dependency>
+            </dependencies>
             <executions>
               <execution>
                 <phase>prepare-package</phase>