Skip to content

Commit aebfc8d

Browse files
committed
fix: tests
Signed-off-by: Pavan Yekbote <[email protected]>
1 parent 507ff12 commit aebfc8d

File tree

1 file changed

+15
-17
lines changed

1 file changed

+15
-17
lines changed

plugin/src/test/java/org/opensearch/ml/cluster/MLCommonsClusterEventListenerTests.java

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import static org.mockito.Mockito.never;
1111
import static org.mockito.Mockito.verify;
1212
import static org.mockito.Mockito.when;
13+
import static org.opensearch.ml.common.CommonValue.ML_JOBS_INDEX;
1314
import static org.opensearch.ml.common.CommonValue.TASK_POLLING_JOB_INDEX;
1415

1516
import java.util.Collections;
@@ -82,45 +83,42 @@ public void testClusterChanged_WithV31DataNode_MetricCollectionEnabled() {
8283
listener.clusterChanged(event);
8384

8485
verify(mlTaskManager).indexStatsCollectorJob(true);
85-
verify(mlTaskManager, never()).startTaskPollingJob();
8686
}
8787

88-
public void testClusterChanged_WithV31DataNode_TaskPollingIndexExists() {
89-
DiscoveryNode dataNode = createDataNode(Version.V_3_1_0);
90-
setupClusterState(dataNode, true);
88+
public void testClusterChanged_WithPreV31DataNode_NoJobsStarted() {
89+
DiscoveryNode dataNode = createDataNode(Version.V_3_0_0);
90+
setupClusterState(dataNode, false);
9191

92-
when(mlFeatureEnabledSetting.isMetricCollectionEnabled()).thenReturn(false);
92+
when(mlFeatureEnabledSetting.isMetricCollectionEnabled()).thenReturn(true);
93+
when(mlFeatureEnabledSetting.isStaticMetricCollectionEnabled()).thenReturn(true);
9394

9495
listener.clusterChanged(event);
9596

9697
verify(mlTaskManager, never()).indexStatsCollectorJob(anyBoolean());
97-
verify(mlTaskManager).startTaskPollingJob();
9898
}
9999

100-
public void testClusterChanged_WithPreV31DataNode_NoJobsStarted() {
101-
DiscoveryNode dataNode = createDataNode(Version.V_3_0_0);
102-
setupClusterState(dataNode, true);
100+
public void testClusterChanged_WithPostV31DataNode_JobsStarted() {
101+
DiscoveryNode dataNode = createDataNode(Version.V_3_2_0);
102+
setupClusterState(dataNode, false);
103103

104104
when(mlFeatureEnabledSetting.isMetricCollectionEnabled()).thenReturn(true);
105105
when(mlFeatureEnabledSetting.isStaticMetricCollectionEnabled()).thenReturn(true);
106106

107107
listener.clusterChanged(event);
108108

109-
verify(mlTaskManager, never()).indexStatsCollectorJob(anyBoolean());
110-
verify(mlTaskManager, never()).startTaskPollingJob();
109+
verify(mlTaskManager).indexStatsCollectorJob(true);
111110
}
112111

113-
public void testClusterChanged_WithPostV31DataNode_JobsStarted() {
114-
DiscoveryNode dataNode = createDataNode(Version.V_3_2_0);
112+
public void testClusterChanged_IndexAlreadyPresent_JobNotStarted() {
113+
DiscoveryNode dataNode = createDataNode(Version.V_3_1_0);
115114
setupClusterState(dataNode, true);
116115

117116
when(mlFeatureEnabledSetting.isMetricCollectionEnabled()).thenReturn(true);
118117
when(mlFeatureEnabledSetting.isStaticMetricCollectionEnabled()).thenReturn(true);
119118

120119
listener.clusterChanged(event);
121120

122-
verify(mlTaskManager).indexStatsCollectorJob(true);
123-
verify(mlTaskManager).startTaskPollingJob();
121+
verify(mlTaskManager, never()).indexStatsCollectorJob(anyBoolean());
124122
}
125123

126124
private DiscoveryNode createDataNode(Version version) {
@@ -134,7 +132,7 @@ private DiscoveryNode createDataNode(Version version) {
134132
);
135133
}
136134

137-
private void setupClusterState(DiscoveryNode node, boolean hasTaskPollingIndex) {
135+
private void setupClusterState(DiscoveryNode node, boolean hasMLJobsIndex) {
138136
DiscoveryNodes nodes = DiscoveryNodes.builder().add(node).build();
139137

140138
when(event.state()).thenReturn(clusterState);
@@ -143,7 +141,7 @@ private void setupClusterState(DiscoveryNode node, boolean hasTaskPollingIndex)
143141
when(clusterState.nodes()).thenReturn(nodes);
144142
when(clusterState.getMetadata()).thenReturn(metadata);
145143
when(clusterService.state()).thenReturn(clusterState);
146-
when(metadata.hasIndex(TASK_POLLING_JOB_INDEX)).thenReturn(hasTaskPollingIndex);
144+
when(metadata.hasIndex(ML_JOBS_INDEX)).thenReturn(hasMLJobsIndex);
147145
when(metadata.settings()).thenReturn(org.opensearch.common.settings.Settings.EMPTY);
148146
}
149147
}

0 commit comments

Comments
 (0)