big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-9870. Remove unused function from OpportunisticContainerAllocatorAMService. Contributed by Abhishek Modi.

Browse Source
This commit is contained in:
Abhishek Modi 2019-10-02 17:55:07 +05:30
parent f1ba9bfad7
commit 61a8436004
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/OpportunisticContainerAllocatorAMService.java
View File

@ -38,7 +38,6 @@
import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeId;
import org.apache.hadoop.yarn.api.records.ResourceRequest; import org.apache.hadoop.yarn.api.records.ResourceRequest;
import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.event.EventHandler;
import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
import org.apache.hadoop.yarn.server.api.DistributedSchedulingAMProtocol; import org.apache.hadoop.yarn.server.api.DistributedSchedulingAMProtocol;
import org.apache.hadoop.yarn.api.impl.pb.service.ApplicationMasterProtocolPBServiceImpl; import org.apache.hadoop.yarn.api.impl.pb.service.ApplicationMasterProtocolPBServiceImpl;
@ -77,7 +76,6 @@
import org.apache.hadoop.yarn.server.scheduler.OpportunisticContainerAllocator; import org.apache.hadoop.yarn.server.scheduler.OpportunisticContainerAllocator;
import org.apache.hadoop.yarn.server.scheduler.OpportunisticContainerContext; import org.apache.hadoop.yarn.server.scheduler.OpportunisticContainerContext;
import org.apache.hadoop.yarn.server.utils.YarnServerSecurityUtils;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
@ -103,7 +101,7 @@ public class OpportunisticContainerAllocatorAMService
private final NodeQueueLoadMonitor nodeMonitor; private final NodeQueueLoadMonitor nodeMonitor;
private final OpportunisticContainerAllocator oppContainerAllocator; private final OpportunisticContainerAllocator oppContainerAllocator;
private final int k; private final int numNodes;
private final long cacheRefreshInterval; private final long cacheRefreshInterval;
private volatile List<RemoteNode> cachedNodes; private volatile List<RemoteNode> cachedNodes;
@ -176,7 +174,7 @@ public void allocate(ApplicationAttemptId appAttemptId,
if (!appAttempt.getApplicationAttemptId().equals(appAttemptId)){ if (!appAttempt.getApplicationAttemptId().equals(appAttemptId)){
LOG.error("Calling allocate on previous or removed or non " LOG.error("Calling allocate on previous or removed or non "
+ "existent application attempt " + appAttemptId); + "existent application attempt {}", appAttemptId);
return; return;
} }
@ -238,7 +236,7 @@ public OpportunisticContainerAllocatorAMService(RMContext rmContext,
new DistributedOpportunisticContainerAllocator( new DistributedOpportunisticContainerAllocator(
rmContext.getContainerTokenSecretManager(), rmContext.getContainerTokenSecretManager(),
maxAllocationsPerAMHeartbeat); maxAllocationsPerAMHeartbeat);
this.k = rmContext.getYarnConfiguration().getInt( this.numNodes = rmContext.getYarnConfiguration().getInt(
YarnConfiguration.OPP_CONTAINER_ALLOCATION_NODES_NUMBER_USED, YarnConfiguration.OPP_CONTAINER_ALLOCATION_NODES_NUMBER_USED,
YarnConfiguration.DEFAULT_OPP_CONTAINER_ALLOCATION_NODES_NUMBER_USED); YarnConfiguration.DEFAULT_OPP_CONTAINER_ALLOCATION_NODES_NUMBER_USED);
long nodeSortInterval = rmContext.getYarnConfiguration().getLong( long nodeSortInterval = rmContext.getYarnConfiguration().getLong(
@ -440,12 +438,12 @@ public void handle(SchedulerEvent event) {
// <-- IGNORED EVENTS : END --> // <-- IGNORED EVENTS : END -->
default: default:
LOG.error("Unknown event arrived at" + LOG.error("Unknown event arrived at" +
"OpportunisticContainerAllocatorAMService: " + event.toString()); "OpportunisticContainerAllocatorAMService: {}", event);
} }
} }
public QueueLimitCalculator getNodeManagerQueueLimitCalculator() { QueueLimitCalculator getNodeManagerQueueLimitCalculator() {
return nodeMonitor.getThresholdCalculator(); return nodeMonitor.getThresholdCalculator();
} }
@ -455,7 +453,7 @@ synchronized List<RemoteNode> getLeastLoadedNodes() {
if ((currTime - lastCacheUpdateTime > cacheRefreshInterval) if ((currTime - lastCacheUpdateTime > cacheRefreshInterval)
|| (cachedNodes == null)) { || (cachedNodes == null)) {
cachedNodes = convertToRemoteNodes( cachedNodes = convertToRemoteNodes(
this.nodeMonitor.selectLeastLoadedNodes(this.k)); this.nodeMonitor.selectLeastLoadedNodes(this.numNodes));
if (cachedNodes.size() > 0) { if (cachedNodes.size() > 0) {
lastCacheUpdateTime = currTime; lastCacheUpdateTime = currTime;
} }
@ -485,12 +483,4 @@ private RemoteNode convertToRemoteNode(NodeId nodeId) {
} }
return null; return null;
} }
private static ApplicationAttemptId getAppAttemptId() throws YarnException {
AMRMTokenIdentifier amrmTokenIdentifier =
YarnServerSecurityUtils.authorizeRequest();
ApplicationAttemptId applicationAttemptId =
amrmTokenIdentifier.getApplicationAttemptId();
return applicationAttemptId;
}
} }