diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java index e497005..f1890a8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java @@ -225,7 +225,7 @@ public abstract void unregisterApplicationMaster(FinalApplicationStatus appStatu * A valid value is available after a call to allocate has been made * @return Currently available resources */ - public abstract Resource getClusterAvailableResources(); + public abstract Resource getAvailableResources(); /** * Get the current number of nodes in the cluster. diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/AMRMClientAsync.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/AMRMClientAsync.java index d24750e..8d551dc 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/AMRMClientAsync.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/AMRMClientAsync.java @@ -189,7 +189,7 @@ public abstract void unregisterApplicationMaster( * A valid value is available after a call to allocate has been made * @return Currently available resources */ - public abstract Resource getClusterAvailableResources(); + public abstract Resource getAvailableResources(); /** * Get the current number of nodes in the cluster. diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java index c188231..e667e37 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java @@ -203,8 +203,8 @@ public void releaseAssignedContainer(ContainerId containerId) { * A valid value is available after a call to allocate has been made * @return Currently available resources */ - public Resource getClusterAvailableResources() { - return client.getClusterAvailableResources(); + public Resource getAvailableResources() { + return client.getAvailableResources(); } /** diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java index a61ae0c..74c86b9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java @@ -380,7 +380,7 @@ public synchronized void releaseAssignedContainer(ContainerId containerId) { } @Override - public synchronized Resource getClusterAvailableResources() { + public synchronized Resource getAvailableResources() { return clusterAvailableResources; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/async/impl/TestAMRMClientAsync.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/async/impl/TestAMRMClientAsync.java index 6c1fcb2..b50742d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/async/impl/TestAMRMClientAsync.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/async/impl/TestAMRMClientAsync.java @@ -95,7 +95,7 @@ public AllocateResponse answer(InvocationOnMock invocation) }).thenReturn(emptyResponse); when(client.registerApplicationMaster(anyString(), anyInt(), anyString())) .thenReturn(null); - when(client.getClusterAvailableResources()).thenAnswer(new Answer() { + when(client.getAvailableResources()).thenAnswer(new Answer() { @Override public Resource answer(InvocationOnMock invocation) throws Throwable { @@ -123,7 +123,7 @@ public Resource answer(InvocationOnMock invocation) // heartbeat will be blocked. make sure we can call client methods at this // time. Checks that heartbeat is not holding onto client lock assert(secondHeartbeatSync.get() < 2); - asyncClient.getClusterAvailableResources(); + asyncClient.getAvailableResources(); // method returned. now unblock heartbeat assert(secondHeartbeatSync.get() < 2); synchronized (heartbeatBlock) {