Skip to content
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

Jump to bottom

Added base strategy metric info in LoadBasedPartitionAssignmentStrategy #857

Merged
merged 4 commits into from
Oct 27, 2021
Merged

Added base strategy metric info in LoadBasedPartitionAssignmentStrategy #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c23f4be
Added base strategy metric info in LoadBasedPartitionAssignmentStrategy
jzakaryan Oct 21, 2021
666cf6b
Added a test for base strategy metrics
jzakaryan Oct 26, 2021
906f825
Fixed order of imports
jzakaryan Oct 26, 2021
998a371
Fixed checkstyle issue with the imports
jzakaryan Oct 26, 2021
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
3 changes: 2 additions & 1 deletion .../java/com/linkedin/datastream/server/assignment/LoadBasedPartitionAssignmentStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ private ClusterThroughputInfo fetchPartitionThroughputInfo(DatastreamGroup datas
*/
@Override
public List<BrooklinMetricInfo> getMetricInfos() {
List<BrooklinMetricInfo> metricInfos = new ArrayList<>();
List<BrooklinMetricInfo> baseStrategyMetricInfos = super.getMetricInfos();
jzakaryan marked this conversation as resolved.
Show resolved Hide resolved
List<BrooklinMetricInfo> metricInfos = new ArrayList<>(baseStrategyMetricInfos);
metricInfos.add(new BrooklinMeterInfo(CLASS_NAME + "." + THROUGHPUT_INFO_FETCH_RATE));
metricInfos.addAll(_assigner.getMetricInfos());
return Collections.unmodifiableList(metricInfos);
Expand Down
7 changes: 7 additions & 0 deletions ...a/com/linkedin/datastream/server/assignment/TestLoadBasedPartitionAssignmentStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Predicate;

import org.apache.commons.lang3.StringUtils;
import org.mockito.Mockito;
Expand Down Expand Up @@ -173,6 +174,12 @@ public void fallbackToBaseClassWhenThroughputFetchFailsTest() {
Mockito.verify(mockProvider, atLeastOnce()).getThroughputInfo(any(DatastreamGroup.class));
Mockito.verify(strategy, never()).doAssignment(anyObject(), anyObject(), anyObject(), anyObject());
Assert.assertNotNull(newAssignment);

// Verify that metrics in both StickyPartitionAssignmentStrategy and LoadBasedPartitionAssignmentStrategy are
// properly registered
Predicate<String> metricFilter = s -> s.startsWith(LoadBasedPartitionAssignmentStrategy.class.getSimpleName()) ||
s.startsWith(StickyPartitionAssignmentStrategy.class.getSimpleName());
MetricsTestUtils.verifyMetrics(strategy, DynamicMetricsManager.getInstance(), metricFilter);
}

@Test
Expand Down