From 6ff9576cc8828b5a587d52244e1e4e6bbffa1858 Mon Sep 17 00:00:00 2001
From: D M Murali Krishna Reddy <muralikrishna.dmmkr@gmail.com>
Date: Wed, 5 Nov 2025 19:56:11 +0530
Subject: [PATCH] YARN-11891. Yarn logs command hangs for running applications

---
 .../main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java
index 163da6fdd0b4da..b0c94c8f89e812 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java
@@ -538,6 +538,9 @@ private List<Pair<ContainerLogFileInfo, String>> getContainerLogFiles(
           JSONArray array = new JSONArray();
           String entity = response.readEntity(String.class);
           JSONObject json = new JSONObject(entity);
+          if (json.has("containerLogsInfoes")) {
+            json = json.getJSONObject("containerLogsInfoes");
+          }
           if (!json.has("containerLogsInfo")) {
             return logFileInfos;
           }
@@ -1531,6 +1534,7 @@ public void filter(ClientRequestContext requestContext) throws IOException {
           }
           // check if a URL is reachable
           checkUrlConnectivity(uri);
+          return;
         } catch (Exception e) {
           leftRetries--;
           if (leftRetries <= 0) {