Skip to content

Commit 7d54b37

Browse files
author
Bhumika Sharma
committed
Fix: UTs of follower and leader checker
Signed-off-by: Bhumika Sharma <[email protected]>
1 parent e831ed6 commit 7d54b37

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
4141
- Added File Cache Pinning ([#17617](https://github.com/opensearch-project/OpenSearch/issues/13648))
4242
- Support consumer reset in Resume API for pull-based ingestion. This PR includes a breaking change for the experimental pull-based ingestion feature. ([#18332](https://github.com/opensearch-project/OpenSearch/pull/18332))
4343
- Add FIPS build tooling ([#4254](https://github.com/opensearch-project/security/issues/4254))
44+
- Added FS Health Check Failure metric ([#18435](https://github.com/opensearch-project/OpenSearch/pull/18435))
4445

4546
### Changed
4647
- Create generic DocRequest to better categorize ActionRequests ([#18269](https://github.com/opensearch-project/OpenSearch/pull/18269)))

server/src/test/java/org/opensearch/cluster/coordination/FollowersCheckerTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ protected void onSendRequest(long requestId, String action, TransportRequest req
200200
followersChecker.clearCurrentNodes();
201201
deterministicTaskQueue.runAllTasks();
202202
assertThat(checkedNodes, empty());
203-
assertEquals(Integer.valueOf(0), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
203+
assertEquals(Double.valueOf(0), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
204204
}
205205

206206
public void testFailsNodeThatDoesNotRespond() {
@@ -215,7 +215,7 @@ public void testFailsNodeThatDoesNotRespond() {
215215
() -> new StatusInfo(HEALTHY, "healthy-info"),
216216
metricsRegistry
217217
);
218-
assertEquals(Integer.valueOf(2), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
218+
assertEquals(Double.valueOf(2), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
219219
}
220220

221221
public void testFailsNodeThatRejectsCheck() {
@@ -229,7 +229,7 @@ public void testFailsNodeThatRejectsCheck() {
229229
() -> new StatusInfo(HEALTHY, "healthy-info"),
230230
metricsRegistry
231231
);
232-
assertEquals(Integer.valueOf(2), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
232+
assertEquals(Double.valueOf(2), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
233233
}
234234

235235
public void testFailureCounterResetsOnSuccess() {
@@ -259,7 +259,7 @@ public Empty get() {
259259
() -> new StatusInfo(HEALTHY, "healthy-info"),
260260
metricsRegistry
261261
);
262-
assertEquals(Integer.valueOf(2), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
262+
assertEquals(Double.valueOf(2), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
263263
}
264264

265265
public void testFailsNodeThatIsDisconnected() {
@@ -272,7 +272,7 @@ public void testFailsNodeThatIsDisconnected() {
272272
() -> new StatusInfo(HEALTHY, "healthy-info"),
273273
metricsRegistry
274274
);
275-
assertEquals(Integer.valueOf(2), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
275+
assertEquals(Double.valueOf(2), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
276276
}
277277

278278
public void testFailsNodeThatDisconnects() {
@@ -340,7 +340,7 @@ public String toString() {
340340
deterministicTaskQueue.runAllRunnableTasks();
341341
assertTrue(nodeFailed.get());
342342
assertThat(followersChecker.getFaultyNodes(), contains(otherNode));
343-
assertEquals(Integer.valueOf(1), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
343+
assertEquals(Double.valueOf(1), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
344344
}
345345

346346
public void testFailsNodeThatIsUnhealthy() {
@@ -353,7 +353,7 @@ public void testFailsNodeThatIsUnhealthy() {
353353
() -> new StatusInfo(HEALTHY, "healthy-info"),
354354
metricsRegistry
355355
);
356-
assertEquals(Integer.valueOf(2), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
356+
assertEquals(Double.valueOf(2), metricsRegistry.getCounterStore().get("followers.checker.failure.count").getCounterValue());
357357
}
358358

359359
private void testBehaviourOfFailingNode(

server/src/test/java/org/opensearch/cluster/coordination/LeaderCheckerTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public String toString() {
233233
);
234234
}
235235
leaderChecker.updateLeader(null);
236-
assertEquals(Integer.valueOf(1), metricsRegistry.getCounterStore().get("leader.checker.failure.count").getCounterValue());
236+
assertEquals(Double.valueOf(1), metricsRegistry.getCounterStore().get("leader.checker.failure.count").getCounterValue());
237237
}
238238

239239
enum Response {
@@ -359,7 +359,7 @@ public String toString() {
359359
deterministicTaskQueue.runAllRunnableTasks();
360360
assertTrue(leaderFailed.get());
361361
}
362-
assertEquals(Integer.valueOf(3), metricsRegistry.getCounterStore().get("leader.checker.failure.count").getCounterValue());
362+
assertEquals(Double.valueOf(3), metricsRegistry.getCounterStore().get("leader.checker.failure.count").getCounterValue());
363363
}
364364

365365
public void testFollowerFailsImmediatelyOnHealthCheckFailure() {
@@ -442,7 +442,7 @@ public String toString() {
442442
assertTrue(leaderFailed.get());
443443
}
444444

445-
assertEquals(Integer.valueOf(1), metricsRegistry.getCounterStore().get("leader.checker.failure.count").getCounterValue());
445+
assertEquals(Double.valueOf(1), metricsRegistry.getCounterStore().get("leader.checker.failure.count").getCounterValue());
446446
}
447447

448448
public void testLeaderBehaviour() {
@@ -539,7 +539,7 @@ public void testLeaderBehaviour() {
539539
equalTo("rejecting leader check from [" + otherNode + "] sent to a node that is no longer the cluster-manager")
540540
);
541541
}
542-
assertEquals(Integer.valueOf(0), metricsRegistry.getCounterStore().get("leader.checker.failure.count").getCounterValue());
542+
assertEquals(Double.valueOf(0), metricsRegistry.getCounterStore().get("leader.checker.failure.count").getCounterValue());
543543
}
544544

545545
private class CapturingTransportResponseHandler implements TransportResponseHandler<Empty> {

0 commit comments

Comments
 (0)