-
Notifications
You must be signed in to change notification settings - Fork 8.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
YARN-11610. [Federation] Add WeightedHomePolicyManager. #6256
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a8554e6
YARN-11610. [Federation] Add WeightedHomePolicyManager.
slfan1989 c656175
YARN-11610. Fix CheckStyle.
slfan1989 7f10954
YARN-11610. Fix CheckStyle.
slfan1989 9dbdadf
YARN-11610. Fix CheckStyle.
slfan1989 7c15239
Merge branch 'apache:trunk' into YARN-11610
slfan1989 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
65 changes: 65 additions & 0 deletions
65
.../org/apache/hadoop/yarn/server/federation/policies/manager/WeightedHomePolicyManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with this | ||
* work for additional information regarding copyright ownership. The ASF | ||
* licenses this file to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
|
||
package org.apache.hadoop.yarn.server.federation.policies.manager; | ||
|
||
import org.apache.hadoop.classification.VisibleForTesting; | ||
import org.apache.hadoop.yarn.server.federation.policies.amrmproxy.HomeAMRMProxyPolicy; | ||
import org.apache.hadoop.yarn.server.federation.policies.dao.WeightedPolicyInfo; | ||
import org.apache.hadoop.yarn.server.federation.policies.exceptions.FederationPolicyInitializationException; | ||
import org.apache.hadoop.yarn.server.federation.policies.router.WeightedRandomRouterPolicy; | ||
import org.apache.hadoop.yarn.server.federation.store.records.SubClusterPolicyConfiguration; | ||
|
||
import java.nio.ByteBuffer; | ||
|
||
/** | ||
* Policy that allows operator to configure "weights" for routing. This picks a | ||
* {@link WeightedRandomRouterPolicy} for the router and a {@link | ||
* HomeAMRMProxyPolicy} for the amrmproxy as they are designed to | ||
* work together. | ||
*/ | ||
public class WeightedHomePolicyManager extends AbstractPolicyManager { | ||
|
||
private WeightedPolicyInfo weightedPolicyInfo; | ||
|
||
public WeightedHomePolicyManager() { | ||
// this structurally hard-codes two compatible policies for Router and | ||
// AMRMProxy. | ||
routerFederationPolicy = WeightedRandomRouterPolicy.class; | ||
amrmProxyFederationPolicy = HomeAMRMProxyPolicy.class; | ||
weightedPolicyInfo = new WeightedPolicyInfo(); | ||
} | ||
|
||
@Override | ||
public SubClusterPolicyConfiguration serializeConf() | ||
throws FederationPolicyInitializationException { | ||
ByteBuffer buf = weightedPolicyInfo.toByteBuffer(); | ||
return SubClusterPolicyConfiguration | ||
.newInstance(getQueue(), this.getClass().getCanonicalName(), buf); | ||
} | ||
|
||
@VisibleForTesting | ||
public WeightedPolicyInfo getWeightedPolicyInfo() { | ||
return weightedPolicyInfo; | ||
} | ||
|
||
@VisibleForTesting | ||
public void setWeightedPolicyInfo( | ||
WeightedPolicyInfo weightedPolicyInfo) { | ||
this.weightedPolicyInfo = weightedPolicyInfo; | ||
} | ||
} |
62 changes: 62 additions & 0 deletions
62
.../apache/hadoop/yarn/server/federation/policies/manager/TestWeightedHomePolicyManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with this | ||
* work for additional information regarding copyright ownership. The ASF | ||
* licenses this file to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
package org.apache.hadoop.yarn.server.federation.policies.manager; | ||
|
||
import org.apache.hadoop.yarn.server.federation.policies.amrmproxy.HomeAMRMProxyPolicy; | ||
import org.apache.hadoop.yarn.server.federation.policies.dao.WeightedPolicyInfo; | ||
import org.apache.hadoop.yarn.server.federation.policies.router.WeightedRandomRouterPolicy; | ||
import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId; | ||
import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo; | ||
import org.junit.Assert; | ||
import org.junit.Before; | ||
import org.junit.Test; | ||
|
||
import java.util.HashMap; | ||
import java.util.Map; | ||
|
||
public class TestWeightedHomePolicyManager extends BasePolicyManagerTest { | ||
private WeightedPolicyInfo policyInfo; | ||
|
||
@Before | ||
public void setup() { | ||
// configure a policy | ||
wfp = new WeightedHomePolicyManager(); | ||
wfp.setQueue("queue1"); | ||
SubClusterId sc1 = SubClusterId.newInstance("sc1"); | ||
policyInfo = new WeightedPolicyInfo(); | ||
|
||
Map<SubClusterIdInfo, Float> routerWeights = new HashMap<>(); | ||
routerWeights.put(new SubClusterIdInfo(sc1), 0.2f); | ||
policyInfo.setRouterPolicyWeights(routerWeights); | ||
|
||
((WeightedHomePolicyManager) wfp).setWeightedPolicyInfo(policyInfo); | ||
|
||
//set expected params that the base test class will use for tests | ||
expectedPolicyManager = WeightedHomePolicyManager.class; | ||
expectedAMRMProxyPolicy = HomeAMRMProxyPolicy.class; | ||
expectedRouterPolicy = WeightedRandomRouterPolicy.class; | ||
} | ||
|
||
@Test | ||
public void testPolicyInfoSetCorrectly() throws Exception { | ||
serializeAndDeserializePolicyManager(wfp, expectedPolicyManager, | ||
expectedAMRMProxyPolicy, expectedRouterPolicy); | ||
// check the policyInfo propagates through ser/der correctly | ||
Assert.assertEquals(((WeightedHomePolicyManager) wfp) | ||
.getWeightedPolicyInfo(), policyInfo); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we declare wfp as WeightedHomePolicyManager directly to avoid the casting around?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you very much for your help in reviewing the code! I will improve this part of the code.