Repository: hadoop Updated Branches: refs/heads/trunk a9d96948e -> 0d8406135
YARN-9054. Fix FederationStateStoreFacade#buildGetSubClustersCacheRequest. Contributed by Bibin A Chundatt. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0d840613 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0d840613 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0d840613 Branch: refs/heads/trunk Commit: 0d8406135f8b8ac427fd7f49f5faf20064ace121 Parents: a9d9694 Author: Giovanni Matteo Fumarola <[email protected]> Authored: Mon Nov 26 10:57:38 2018 -0800 Committer: Giovanni Matteo Fumarola <[email protected]> Committed: Mon Nov 26 10:57:38 2018 -0800 ---------------------------------------------------------------------- .../utils/FederationStateStoreFacade.java | 5 +++-- .../utils/FederationStateStoreTestUtil.java | 2 +- .../utils/TestFederationStateStoreFacade.java | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d840613/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java index 5d9702f..6933d7c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java @@ -463,8 +463,9 @@ public final class FederationStateStoreFacade { private Object buildGetSubClustersCacheRequest( final boolean filterInactiveSubClusters) { - final String cacheKey = buildCacheKey(getClass().getSimpleName(), - GET_SUBCLUSTERS_CACHEID, null); + final String cacheKey = + buildCacheKey(getClass().getSimpleName(), GET_SUBCLUSTERS_CACHEID, + Boolean.toString(filterInactiveSubClusters)); CacheRequest<String, Map<SubClusterId, SubClusterInfo>> cacheRequest = new CacheRequest<String, Map<SubClusterId, SubClusterInfo>>(cacheKey, new Func<String, Map<SubClusterId, SubClusterInfo>>() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d840613/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreTestUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreTestUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreTestUtil.java index 5d4c8d5..46cf034 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreTestUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreTestUtil.java @@ -172,7 +172,7 @@ public class FederationStateStoreTestUtil { } } - private void deRegisterSubCluster(SubClusterId subClusterId) + public void deRegisterSubCluster(SubClusterId subClusterId) throws YarnException { stateStore.deregisterSubCluster(SubClusterDeregisterRequest .newInstance(subClusterId, SubClusterState.SC_UNREGISTERED)); http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d840613/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java index 6328122..56fa052 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.federation.utils; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Map; @@ -136,6 +137,22 @@ public class TestFederationStateStoreFacade { } @Test + public void testSubClustersCache() throws YarnException { + Map<SubClusterId, SubClusterInfo> allClusters = + facade.getSubClusters(false); + Assert.assertEquals(numSubClusters, allClusters.size()); + SubClusterId clusterId = new ArrayList<>(allClusters.keySet()).get(0); + // make one subcluster down unregister + stateStoreTestUtil.deRegisterSubCluster(clusterId); + Map<SubClusterId, SubClusterInfo> activeClusters = + facade.getSubClusters(true); + Assert.assertEquals(numSubClusters - 1, activeClusters.size()); + // Recheck false case. + allClusters = facade.getSubClusters(false); + Assert.assertEquals(numSubClusters, allClusters.size()); + } + + @Test public void testInvalidGetPolicyConfiguration() throws YarnException { Assert.assertNull( facade.getPolicyConfiguration(FederationStateStoreTestUtil.INVALID)); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
