Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A4DE3200C1B for ; Tue, 31 Jan 2017 02:57:28 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A385E160B64; Tue, 31 Jan 2017 01:57:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 03AF8160B4D for ; Tue, 31 Jan 2017 02:57:27 +0100 (CET) Received: (qmail 83428 invoked by uid 500); 31 Jan 2017 01:57:19 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 78765 invoked by uid 99); 31 Jan 2017 01:57:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Jan 2017 01:57:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C73CE01C8; Tue, 31 Jan 2017 01:57:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fabbri@apache.org To: common-commits@hadoop.apache.org Date: Tue, 31 Jan 2017 01:57:58 -0000 Message-Id: In-Reply-To: <7672b345db3c489b9ab514860550baca@git.apache.org> References: <7672b345db3c489b9ab514860550baca@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/50] [abbrv] hadoop git commit: YARN-6126. Obtaining app logs for Running application fails with json parse error. Contributed by Xuan Gong. archived-at: Tue, 31 Jan 2017 01:57:28 -0000 YARN-6126. Obtaining app logs for Running application fails with json parse error. Contributed by Xuan Gong. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a16431b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a16431b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a16431b Branch: refs/heads/HADOOP-13345 Commit: 1a16431bd0df52d2df32c594f8b9b506c2101ad8 Parents: 165f07f Author: Junping Du Authored: Fri Jan 27 06:31:10 2017 -0800 Committer: Junping Du Committed: Fri Jan 27 06:31:10 2017 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/yarn/client/cli/LogsCLI.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a16431b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java ---------------------------------------------------------------------- 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 b8119e5..1de4cd1 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 @@ -426,8 +426,17 @@ public class LogsCLI extends Configured implements Tool { if (response.getStatusInfo().getStatusCode() == ClientResponse.Status.OK.getStatusCode()) { try { + JSONArray array = new JSONArray(); JSONObject json = response.getEntity(JSONObject.class); - JSONArray array = json.getJSONArray("containerLogsInfo"); + Object logsInfoObj = json.get("containerLogsInfo"); + if (logsInfoObj instanceof JSONObject) { + array.put((JSONObject)logsInfoObj); + } else if (logsInfoObj instanceof JSONArray) { + JSONArray logsArray = (JSONArray)logsInfoObj; + for (int i=0; i < logsArray.length(); i++) { + array.put(logsArray.getJSONObject(i)); + } + } for (int i = 0; i < array.length(); i++) { JSONObject log = array.getJSONObject(i); Object ob = log.get("containerLogInfo"); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org