This is an automated email from the ASF dual-hosted git repository.
zstan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new d35cb639e2d IGNITE-28479 Fix Logging at INFO level without checking
during GridCollisionManager start (#12989)
d35cb639e2d is described below
commit d35cb639e2d4c7cbaf41a79f2801db4468cafc6b
Author: Evgeniy Stanilovskiy <[email protected]>
AuthorDate: Thu Apr 9 07:52:48 2026 +0300
IGNITE-28479 Fix Logging at INFO level without checking during
GridCollisionManager start (#12989)
---
.../internal/managers/collision/GridCollisionManager.java | 6 ++++--
.../internal/GridCollisionManagerLoggingSelfTest.java | 13 +++++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
index 75d5b0d654e..16ef0b8f39f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java
@@ -58,8 +58,10 @@ public class GridCollisionManager extends
GridManagerAdapter<CollisionSpi> {
}
});
}
- else
- log.info("Collision resolution is disabled (all jobs will be
activated upon arrival).");
+ else {
+ if (log.isInfoEnabled())
+ log.info("Collision resolution is disabled (all jobs will be
activated upon arrival).");
+ }
if (log.isDebugEnabled())
log.debug(startInfo());
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java
index 91397102163..7dd82255610 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java
@@ -28,6 +28,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
/**
* Tests for making sure that {@link GridCollisionManager} logs about specific
conditions at correct levels,
@@ -56,9 +57,17 @@ public class GridCollisionManagerLoggingSelfTest {
public void collisionResolutionDisabledMessageShouldBeLoggedAtInfoLevel()
throws Exception {
GridCollisionManager mgr = new
GridCollisionManager(collisionResolutionDisabledContext());
- mgr.start();
+ boolean infoLevel = logger.isInfoEnabled();
+ when(logger.isInfoEnabled()).thenReturn(true);
- verify(logger).info("Collision resolution is disabled (all jobs will
be activated upon arrival).");
+ try {
+ mgr.start();
+
+ verify(logger).info("Collision resolution is disabled (all jobs
will be activated upon arrival).");
+ }
+ finally {
+ when(logger.isInfoEnabled()).thenReturn(infoLevel);
+ }
}
/**