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 019B3200C0F for ; Thu, 19 Jan 2017 06:11:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 00332160B44; Thu, 19 Jan 2017 05:11:16 +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 497E0160B43 for ; Thu, 19 Jan 2017 06:11:15 +0100 (CET) Received: (qmail 52000 invoked by uid 500); 19 Jan 2017 05:11:14 -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 51991 invoked by uid 99); 19 Jan 2017 05:11:14 -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; Thu, 19 Jan 2017 05:11:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 24E15DFB86; Thu, 19 Jan 2017 05:11:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: varunsaxena@apache.org To: common-commits@hadoop.apache.org Message-Id: <027d7ceb67774bbea0c79822ef9d2643@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: Addendum for YARN-6064. Support fromId for flowRuns and flow/flowRun apps REST API's Date: Thu, 19 Jan 2017 05:11:14 +0000 (UTC) archived-at: Thu, 19 Jan 2017 05:11:16 -0000 Repository: hadoop Updated Branches: refs/heads/YARN-5355-branch-2 2fec95b57 -> c11078fd2 Addendum for YARN-6064. Support fromId for flowRuns and flow/flowRun apps REST API's (cherry picked from commit c9246f619104bff44dd453a4ffe70104d37fd781) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c11078fd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c11078fd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c11078fd Branch: refs/heads/YARN-5355-branch-2 Commit: c11078fd2932d491a6c3ceff6f6050dfb59057a0 Parents: 2fec95b Author: Varun Saxena Authored: Thu Jan 19 10:15:28 2017 +0530 Committer: Varun Saxena Committed: Thu Jan 19 10:18:53 2017 +0530 ---------------------------------------------------------------------- .../storage/reader/ApplicationEntityReader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c11078fd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/ApplicationEntityReader.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/ApplicationEntityReader.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/ApplicationEntityReader.java index 8a331c3..4e8286d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/ApplicationEntityReader.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/ApplicationEntityReader.java @@ -375,9 +375,9 @@ class ApplicationEntityReader extends GenericEntityReader { Long flowRunId = context.getFlowRunId(); if (flowRunId == null) { AppToFlowRowKey appToFlowRowKey = new AppToFlowRowKey( - context.getClusterId(), getFilters().getFromId()); - FlowContext flowContext = - lookupFlowContext(appToFlowRowKey, hbaseConf, conn); + getFilters().getFromId()); + FlowContext flowContext = lookupFlowContext(appToFlowRowKey, + context.getClusterId(), hbaseConf, conn); flowRunId = flowContext.getFlowRunId(); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org