Skip to content

Change calculation for baseline divergence. #598

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.

Sign up for GitHub

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

Merged
jiajunwang merged 2 commits into from
Nov 13, 2019
Merged

Change calculation for baseline divergence. #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6b9581
Change calculation for baseline divergence gauge.
huizhilu Nov 13, 2019
c80a719
Remove space.
huizhilu Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...re/src/main/java/org/apache/helix/controller/rebalancer/util/ResourceUsageCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ public static Map<String, Integer> getResourceUsage(ResourcesStateMap resourceAs
* }
* }
* }
* baseline divergence = (matched: 1) / (total(matched + doesn't match): 3) = 1/3 ~= 0.333
* baseline divergence = (doesn't match: 2) / (total(matched + doesn't match): 3) = 2/3 ~= 0.66667
* If divergence == 1.0, all are different(no match); divergence == 0.0, no difference.
*
* @param baseline baseline assignment
* @param bestPossibleAssignment best possible assignment
* @return double value range at [0.0, 1.0]
Expand Down Expand Up @@ -138,7 +140,7 @@ public static double measureBaselineDivergence(Map<String, ResourceAssignment> b
}
}

return numTotalBestPossibleReplicas == 0 ? 0.0d
: (double) numMatchedReplicas / (double) numTotalBestPossibleReplicas;
return numTotalBestPossibleReplicas == 0 ? 1.0d
: (1.0d - (double) numMatchedReplicas / (double) numTotalBestPossibleReplicas);
}
}
10 changes: 5 additions & 5 deletions ...rc/test/java/org/apache/helix/controller/rebalancer/util/TestResourceUsageCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ public void testMeasureBaselineDivergence(Map<String, Map<String, Map<String, St

// Empty best possible assignment.
Assert.assertEquals(ResourceUsageCalculator
.measureBaselineDivergence(baselineAssignment, Collections.emptyMap()), 0.0d);
.measureBaselineDivergence(baselineAssignment, Collections.emptyMap()), 1.0d);
// Empty baseline assignment.
Assert.assertEquals(ResourceUsageCalculator
.measureBaselineDivergence(Collections.emptyMap(), noMatchBestPossibleAssignment), 0.0d);
.measureBaselineDivergence(Collections.emptyMap(), noMatchBestPossibleAssignment), 1.0d);

Assert.assertEquals(ResourceUsageCalculator
.measureBaselineDivergence(baselineAssignment, noMatchBestPossibleAssignment), 0.0d);
.measureBaselineDivergence(baselineAssignment, noMatchBestPossibleAssignment), 1.0d);
Assert.assertEquals(ResourceUsageCalculator
.measureBaselineDivergence(baselineAssignment, someMatchBestPossibleAssignment),
(double) 1 / (double) 3);
(1.0d - (double) 1 / (double) 3));
Assert.assertEquals(
ResourceUsageCalculator.measureBaselineDivergence(baselineAssignment, baselineAssignment),
1.0d);
0.0d);
}

private Map<String, ResourceAssignment> buildResourceAssignment(
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/org/apache/helix/controller/rebalancer/waged/TestWagedRebalancerMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public void testWagedRebalanceMetrics()
// Wait for asyncReportBaselineDivergenceGauge to complete and verify.
Assert.assertTrue(TestHelper.verify(() -> (double) metricCollector.getMetric(
WagedRebalancerMetricCollector.WagedRebalancerMetricNames.BaselineDivergenceGauge.name(),
RatioMetric.class).getLastEmittedMetricValue() == 1.0d, TestHelper.WAIT_DURATION));
RatioMetric.class).getLastEmittedMetricValue() == 0.0d, TestHelper.WAIT_DURATION));
}

@Override
Expand Down