Skip to content

Commit d35cb63

Browse files
authored
IGNITE-28479 Fix Logging at INFO level without checking during GridCollisionManager start (#12989)
1 parent 2b10e24 commit d35cb63

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ public GridCollisionManager(GridKernalContext ctx) {
5858
}
5959
});
6060
}
61-
else
62-
log.info("Collision resolution is disabled (all jobs will be activated upon arrival).");
61+
else {
62+
if (log.isInfoEnabled())
63+
log.info("Collision resolution is disabled (all jobs will be activated upon arrival).");
64+
}
6365

6466
if (log.isDebugEnabled())
6567
log.debug(startInfo());

modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import static org.mockito.Mockito.doReturn;
2929
import static org.mockito.Mockito.mock;
3030
import static org.mockito.Mockito.verify;
31+
import static org.mockito.Mockito.when;
3132

3233
/**
3334
* Tests for making sure that {@link GridCollisionManager} logs about specific conditions at correct levels,
@@ -56,9 +57,17 @@ public void initLoggerMock() {
5657
public void collisionResolutionDisabledMessageShouldBeLoggedAtInfoLevel() throws Exception {
5758
GridCollisionManager mgr = new GridCollisionManager(collisionResolutionDisabledContext());
5859

59-
mgr.start();
60+
boolean infoLevel = logger.isInfoEnabled();
61+
when(logger.isInfoEnabled()).thenReturn(true);
6062

61-
verify(logger).info("Collision resolution is disabled (all jobs will be activated upon arrival).");
63+
try {
64+
mgr.start();
65+
66+
verify(logger).info("Collision resolution is disabled (all jobs will be activated upon arrival).");
67+
}
68+
finally {
69+
when(logger.isInfoEnabled()).thenReturn(infoLevel);
70+
}
6271
}
6372

6473
/**

0 commit comments

Comments
 (0)