hadoop 60e4116bf1d00afed91010e57357fe54057e4e39

60e4116bf1d00afed91010e57357fe54057e4e39

Files Diff

Added: 6
Removed: 0
Renamed: 0
Modified: 9

Link to commit

Dependency Action

Refactorings reported:

Refactoring Name	Occurences
Move And Rename Method	1
Move And Rename Method private getContainersToPreempt(leafQueueNames Set<String>, clusterResource Resource) : Map<ApplicationAttemptId,Set<RMContainer>> from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to public selectCandidates(selectedCandidates Map<ApplicationAttemptId,Set<RMContainer>>, clusterResource Resource, totalPreemptionAllowed Resource) : Map<ApplicationAttemptId,Set<RMContainer>> from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.FifoCandidatesSelector	From	To
Move Method	10
Move Method package sortContainers(containers List<RMContainer>) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to package sortContainers(containers List<RMContainer>) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.FifoCandidatesSelector	From	To
Move Method private resetCapacity(rc ResourceCalculator, clusterResource Resource, queues Collection<TempQueuePerPartition>, ignoreGuar boolean) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to private resetCapacity(rc ResourceCalculator, clusterResource Resource, queues Collection<TempQueuePerPartition>, ignoreGuar boolean) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.PreemptableResourceCalculator	From	To
Move Method private tryPreemptContainerAndDeductResToObtain(resourceToObtainByPartitions Map<String,Resource>, rmContainer RMContainer, clusterResource Resource, preemptMap Map<ApplicationAttemptId,Set<RMContainer>>) : boolean from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to private tryPreemptContainerAndDeductResToObtain(resourceToObtainByPartitions Map<String,Resource>, rmContainer RMContainer, clusterResource Resource, preemptMap Map<ApplicationAttemptId,Set<RMContainer>>, totalPreemptionAllowed Resource) : boolean from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.FifoCandidatesSelector	From	To
Move Method private computeIdealResourceDistribution(rc ResourceCalculator, queues List<TempQueuePerPartition>, totalPreemptionAllowed Resource, tot_guarant Resource) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to private computeIdealResourceDistribution(rc ResourceCalculator, queues List<TempQueuePerPartition>, totalPreemptionAllowed Resource, tot_guarant Resource) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.PreemptableResourceCalculator	From	To
Move Method private preemptFrom(app FiCaSchedulerApp, clusterResource Resource, resToObtainByPartition Map<String,Resource>, skippedAMContainerlist List<RMContainer>, skippedAMSize Resource, preemptMap Map<ApplicationAttemptId,Set<RMContainer>>) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to private preemptFrom(app FiCaSchedulerApp, clusterResource Resource, resToObtainByPartition Map<String,Resource>, skippedAMContainerlist List<RMContainer>, skippedAMSize Resource, selectedContainers Map<ApplicationAttemptId,Set<RMContainer>>, totalPreemptionAllowed Resource) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.FifoCandidatesSelector	From	To
Move Method private preemptMapContains(preemptMap Map<ApplicationAttemptId,Set<RMContainer>>, attemptId ApplicationAttemptId, rmContainer RMContainer) : boolean from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to private preemptMapContains(preemptMap Map<ApplicationAttemptId,Set<RMContainer>>, attemptId ApplicationAttemptId, rmContainer RMContainer) : boolean from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.FifoCandidatesSelector	From	To
Move Method private computeFixpointAllocation(rc ResourceCalculator, tot_guarant Resource, qAlloc Collection<TempQueuePerPartition>, unassigned Resource, ignoreGuarantee boolean) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to private computeFixpointAllocation(rc ResourceCalculator, tot_guarant Resource, qAlloc Collection<TempQueuePerPartition>, unassigned Resource, ignoreGuarantee boolean) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.PreemptableResourceCalculator	From	To
Move Method protected getMostUnderservedQueues(orderedByNeed PriorityQueue<TempQueuePerPartition>, tqComparator TQComparator) : Collection<TempQueuePerPartition> from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to protected getMostUnderservedQueues(orderedByNeed PriorityQueue<TempQueuePerPartition>, tqComparator TQComparator) : Collection<TempQueuePerPartition> from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.PreemptableResourceCalculator	From	To
Move Method private preemptAMContainers(clusterResource Resource, preemptMap Map<ApplicationAttemptId,Set<RMContainer>>, skippedAMContainerlist List<RMContainer>, resToObtainByPartition Map<String,Resource>, skippedAMSize Resource, maxAMCapacityForThisQueue Resource) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to private preemptAMContainers(clusterResource Resource, preemptMap Map<ApplicationAttemptId,Set<RMContainer>>, skippedAMContainerlist List<RMContainer>, resToObtainByPartition Map<String,Resource>, skippedAMSize Resource, maxAMCapacityForThisQueue Resource, totalPreemptionAllowed Resource) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.FifoCandidatesSelector	From	To
Move Method private addToPreemptMap(preemptMap Map<ApplicationAttemptId,Set<RMContainer>>, appAttemptId ApplicationAttemptId, containerToPreempt RMContainer) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to private addToPreemptMap(preemptMap Map<ApplicationAttemptId,Set<RMContainer>>, appAttemptId ApplicationAttemptId, containerToPreempt RMContainer) : void from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.FifoCandidatesSelector	From	To
Move Attribute	1
Move Attribute public TOTAL_PREEMPTION_PER_ROUND : String from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy to public TOTAL_PREEMPTION_PER_ROUND : String from class org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration	From	To
Extract Class	2
Extract Class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.FifoCandidatesSelector from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Extract Class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.PreemptableResourceCalculator from class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Move Class	2
Move Class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy.TQComparator moved to org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.PreemptableResourceCalculator.TQComparator	From	To
Move Class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy.TempQueuePerPartition moved to org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.TempQueuePerPartition	From	To
Change Variable Type	1
Change Variable Type partition : String to selector : PreemptionCandidatesSelector in method private containerBasedPreemptOrKill(root CSQueue, clusterResources Resource) : void in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Extract Method	2
Extract Method private preemptOrkillSelectedContainerAfterWait(selectedCandidates Map<ApplicationAttemptId,Set<RMContainer>>) : void extracted from private containerBasedPreemptOrKill(root CSQueue, clusterResources Resource) : void in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Extract Method private cleanupStaledPreemptionCandidates() : void extracted from private containerBasedPreemptOrKill(root CSQueue, clusterResources Resource) : void in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Rename Method	2
Rename Method public getShallowCopyOfPreemptableEntities() : Map<String,PreemptableQueue> renamed to public getShallowCopyOfPreemptableQueues() : Map<String,PreemptableQueue> in class org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.preemption.PreemptionManager	From	To
Rename Method private recursivelyComputeIdealAssignment(root TempQueuePerPartition, totalPreemptionAllowed Resource) : Set<String> renamed to private getLeafQueueNames(q TempQueuePerPartition) : Set<String> in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Rename Variable	2
Rename Variable partition : String to selector : PreemptionCandidatesSelector in method private containerBasedPreemptOrKill(root CSQueue, clusterResources Resource) : void in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Rename Variable t : TempQueuePerPartition to child : TempQueuePerPartition in method private getLeafQueueNames(q TempQueuePerPartition) : Set<String> in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Parameterize Variable	1
Parameterize Variable toPreempt : Map<ApplicationAttemptId,Set<RMContainer>> to selectedCandidates : Map<ApplicationAttemptId,Set<RMContainer>> in method private preemptOrkillSelectedContainerAfterWait(selectedCandidates Map<ApplicationAttemptId,Set<RMContainer>>) : void in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Rename Attribute	3
Rename Attribute preempted : Map<RMContainer,Long> to preemptionCandidates : Map<RMContainer,Long> in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Rename Attribute actuallyPreempted : Resource to actuallyToBePreempted : Resource in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.TempQueuePerPartition	From	To
Rename Attribute preemptableEntities : Map<String,PreemptableQueue> to preemptableQueues : Map<String,PreemptableQueue> in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Extract Interface	1
Extract Interface org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.CapacitySchedulerPreemptionContext from classes [org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy]	From	To
Change Attribute Type	2
Change Attribute Type conf : Configuration to conf : CapacitySchedulerConfiguration in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.TestProportionalCapacityPreemptionPolicy	From	To
Change Attribute Type conf : Configuration to conf : CapacitySchedulerConfiguration in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.TestProportionalCapacityPreemptionPolicyForNodePartitions	From	To
Rename Parameter	3
Rename Parameter root : TempQueuePerPartition to q : TempQueuePerPartition in method private getLeafQueueNames(q TempQueuePerPartition) : Set<String> in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy	From	To
Rename Parameter preemptMap : Map<ApplicationAttemptId,Set<RMContainer>> to selectedContainers : Map<ApplicationAttemptId,Set<RMContainer>> in method private preemptFrom(app FiCaSchedulerApp, clusterResource Resource, resToObtainByPartition Map<String,Resource>, skippedAMContainerlist List<RMContainer>, skippedAMSize Resource, selectedContainers Map<ApplicationAttemptId,Set<RMContainer>>, totalPreemptionAllowed Resource) : void in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.FifoCandidatesSelector	From	To
Rename Parameter killableResource : Resource to killable : Resource in method package TempQueuePerPartition(queueName String, current Resource, pending Resource, guaranteed Resource, maxCapacity Resource, preemptionDisabled boolean, partition String, killable Resource) in class org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.TempQueuePerPartition	From	To

60e4116bf1d00afed91010e57357fe54057e4e39

Files Diff

Link to commit

Third party dependencies:

Refactorings reported: