You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2017/09/12 00:36:26 UTC

[84/84] [abbrv] hadoop git commit: Rebased onto trunk - fix conflicts

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/52da2dd7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/52da2dd7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/52da2dd7

Branch: refs/heads/yarn-native-services
Commit: 52da2dd7bc8a528470d04a5eedb01050d0de5248
Parents: f439ed2
Author: Jian He <ji...@apache.org>
Authored: Mon Sep 11 17:34:30 2017 -0700
Committer: Jian He <ji...@apache.org>
Committed: Mon Sep 11 17:34:30 2017 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/yarn/service/ServiceScheduler.java | 11 +++++++++++
 1 file changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/52da2dd7/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org