Rebased onto trunk - fix conflicts
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/307d55b3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/307d55b3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/307d55b3 Branch: refs/heads/trunk Commit: 307d55b3e1ec9261c73e63286887c0b90a0c961e Parents: 541b64c Author: Jian He <jia...@apache.org> Authored: Mon Sep 11 17:34:30 2017 -0700 Committer: Jian He <jia...@apache.org> Committed: Mon Nov 6 13:30:15 2017 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/service/ServiceScheduler.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/307d55b3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java index fb2fd16..7b809b9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java @@ -574,6 +574,11 @@ public class ServiceScheduler extends CompositeService { } + @Override public void onContainerResourceUpdated(ContainerId containerId, + Resource resource) { + + } + @Override public void onGetContainerStatusError(ContainerId containerId, Throwable t) { @@ -586,6 +591,12 @@ public class ServiceScheduler extends CompositeService { } @Override + public void onUpdateContainerResourceError(ContainerId containerId, + Throwable t) { + + } + + @Override public void onStopContainerError(ContainerId containerId, Throwable t) { } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
