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/5efd6cc7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5efd6cc7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5efd6cc7 Branch: refs/heads/YARN-5355-branch-2 Commit: 5efd6cc726a21955a36a5507e615666802e24b21 Parents: 5d27b1c Author: Varun Saxena <varunsax...@apache.org> Authored: Thu Jan 19 10:15:28 2017 +0530 Committer: Varun Saxena <varunsax...@apache.org> Committed: Tue Apr 25 23:14:28 2017 +0530 ---------------------------------------------------------------------- .../storage/reader/ApplicationEntityReader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5efd6cc7/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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
