This is an automated email from the ASF dual-hosted git repository.
bteke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9bf5e38c483 YARN-11745: Fix TimSort contract violation in
PriorityQueueComparator Class (#7278)
9bf5e38c483 is described below
commit 9bf5e38c48353ee60db36274d8bef13c1c3626b0
Author: Hean Chhinling <92643868+hean-chhinl...@users.noreply.github.com>
AuthorDate: Mon Jan 20 14:31:06 2025 +0100
YARN-11745: Fix TimSort contract violation in PriorityQueueComparator Class
(#7278)
---
.../PriorityUtilizationQueueOrderingPolicy.java | 6 +--
...TestPriorityUtilizationQueueOrderingPolicy.java | 54 ++++++++++++++++++++++
2 files changed, 57 insertions(+), 3 deletions(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/policy/PriorityUtilizationQueueOrderingPolicy.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/policy/PriorityUtilizationQueueOrderingPolicy.java
index 5da54e1ec6c..f63d2799309 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/policy/PriorityUtilizationQueueOrderingPolicy.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/policy/PriorityUtilizationQueueOrderingPolicy.java
@@ -91,12 +91,12 @@ public static int compare(double relativeAssigned1, double
relativeAssigned2,
/**
* Comparator that both looks at priority and utilization
*/
- final private class PriorityQueueComparator
+ final public class PriorityQueueComparator
implements Comparator<PriorityQueueResourcesForSorting> {
final private String partition;
- private PriorityQueueComparator(String partition) {
+ public PriorityQueueComparator(String partition) {
this.partition = partition;
}
@@ -164,7 +164,7 @@ private int compare(PriorityQueueResourcesForSorting q1Sort,
q1Sort.configuredMinResource;
Resource minEffRes2 =
q2Sort.configuredMinResource;
- if (!minEffRes1.equals(Resources.none()) && !minEffRes2.equals(
+ if (!minEffRes1.equals(Resources.none()) || !minEffRes2.equals(
Resources.none())) {
return minEffRes2.compareTo(minEffRes1);
}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/policy/TestPriorityUtilizationQueueOrderingPolicy.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/policy/TestPriorityUtilizationQueueOrderingPolicy.java
index dad888de0f1..9d98430d31a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/policy/TestPriorityUtilizationQueueOrderingPolicy.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/policy/TestPriorityUtilizationQueueOrderingPolicy.java
@@ -33,6 +33,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.Collections;
+
import java.util.concurrent.ThreadLocalRandom;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -309,6 +311,58 @@ public void testComparatorDoesNotValidateGeneralContract()
{
assertDoesNotThrow(() -> policy.getAssignmentIterator(partition));
}
+ @Test
+ public void testComparatorClassDoesNotViolateTimSortContract() {
+ String partition = "testPartition";
+
+ List<PriorityUtilizationQueueOrderingPolicy.
+ PriorityQueueResourcesForSorting> queues = new ArrayList<>();
+ for (int i = 0; i < 1000; i++) { // 1000 queues to have enough queues so
the exception occur
+ queues.add(createMockPriorityQueueResourcesForSorting(partition));
+ }
+
+ Collections.shuffle(queues);
+ // java.lang.IllegalArgumentException: Comparison method violates its
general contract!
+ assertDoesNotThrow(() -> queues.sort(new
PriorityUtilizationQueueOrderingPolicy(true)
+ .new PriorityQueueComparator(partition)));
+
+ }
+
+ private PriorityUtilizationQueueOrderingPolicy.
+ PriorityQueueResourcesForSorting
createMockPriorityQueueResourcesForSorting(
+ String partition) {
+ QueueResourceQuotas resourceQuotas = randomResourceQuotas(partition);
+
+ boolean isZeroResource = ThreadLocalRandom.current().nextBoolean();
+ if (isZeroResource) {
+ resourceQuotas.setConfiguredMinResource(partition,
Resource.newInstance(0, 0));
+ }
+
+ QueueCapacities mockQueueCapacities = mock(QueueCapacities.class);
+ when(mockQueueCapacities.getAbsoluteUsedCapacity(partition))
+ .thenReturn(4.2f); // could be any specific number, so that there
are equal values
+ when(mockQueueCapacities.getUsedCapacity(partition))
+ .thenReturn(1.0f); // could be any specific number, so that there
are equal values
+ when(mockQueueCapacities.getAbsoluteCapacity(partition))
+ .thenReturn(6.2f); // could be any specific number, so that there
are equal values
+
+ CSQueue mockQueue = mock(CSQueue.class);
+ when(mockQueue.getQueueCapacities())
+ .thenReturn(mockQueueCapacities);
+ when(mockQueue.getPriority())
+ .thenReturn(Priority.newInstance(7)); // could be any specific
number,
+ // so that there are equal values
+ when(mockQueue.getAccessibleNodeLabels())
+ .thenReturn(Collections.singleton(partition));
+ when(mockQueue.getQueueResourceQuotas())
+ .thenReturn(resourceQuotas);
+
+ return new
PriorityUtilizationQueueOrderingPolicy.PriorityQueueResourcesForSorting(
+ mockQueue, partition
+ );
+
+ }
+
private QueueCapacities randomQueueCapacities(String partition) {
QueueCapacities qc = new QueueCapacities(false);
qc.setAbsoluteCapacity(partition, (float) randFloat(0.0d, 100.0d));
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
