Repository: ignite Updated Branches: refs/heads/master 46d6da578 -> 3785cc4c5
IGNITE-8228 Print out information about configured failure handler Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3785cc4c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3785cc4c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3785cc4c Branch: refs/heads/master Commit: 3785cc4c5ee449b96bdc0b25d0afbdc43bdc8093 Parents: 46d6da5 Author: Andrey Gura <[email protected]> Authored: Mon Apr 23 16:31:57 2018 +0300 Committer: Andrey Gura <[email protected]> Committed: Mon Apr 23 17:02:08 2018 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/failure/NoOpFailureHandler.java | 6 ++++++ .../apache/ignite/failure/RestartProcessFailureHandler.java | 6 ++++++ .../java/org/apache/ignite/failure/StopNodeFailureHandler.java | 6 ++++++ .../apache/ignite/failure/StopNodeOrHaltFailureHandler.java | 6 ++++++ .../ignite/internal/processors/failure/FailureProcessor.java | 6 ++++-- 5 files changed, 28 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3785cc4c/modules/core/src/main/java/org/apache/ignite/failure/NoOpFailureHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/failure/NoOpFailureHandler.java b/modules/core/src/main/java/org/apache/ignite/failure/NoOpFailureHandler.java index 2ec645e..b998d62 100644 --- a/modules/core/src/main/java/org/apache/ignite/failure/NoOpFailureHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/failure/NoOpFailureHandler.java @@ -18,6 +18,7 @@ package org.apache.ignite.failure; import org.apache.ignite.Ignite; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Just ignores any failure. It's useful for tests and debugging. @@ -27,4 +28,9 @@ public class NoOpFailureHandler implements FailureHandler { @Override public boolean onFailure(Ignite ignite, FailureContext failureCtx) { return false; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(NoOpFailureHandler.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/3785cc4c/modules/core/src/main/java/org/apache/ignite/failure/RestartProcessFailureHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/failure/RestartProcessFailureHandler.java b/modules/core/src/main/java/org/apache/ignite/failure/RestartProcessFailureHandler.java index 4f4432f..fe65b28 100644 --- a/modules/core/src/main/java/org/apache/ignite/failure/RestartProcessFailureHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/failure/RestartProcessFailureHandler.java @@ -20,6 +20,7 @@ package org.apache.ignite.failure; import org.apache.ignite.Ignite; import org.apache.ignite.Ignition; import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; /** @@ -42,4 +43,9 @@ public class RestartProcessFailureHandler implements FailureHandler { return true; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(RestartProcessFailureHandler.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/3785cc4c/modules/core/src/main/java/org/apache/ignite/failure/StopNodeFailureHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/failure/StopNodeFailureHandler.java b/modules/core/src/main/java/org/apache/ignite/failure/StopNodeFailureHandler.java index f05cc76..861d220 100644 --- a/modules/core/src/main/java/org/apache/ignite/failure/StopNodeFailureHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/failure/StopNodeFailureHandler.java @@ -19,6 +19,7 @@ package org.apache.ignite.failure; import org.apache.ignite.Ignite; import org.apache.ignite.internal.IgnitionEx; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; /** @@ -40,4 +41,9 @@ public class StopNodeFailureHandler implements FailureHandler { return true; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(StopNodeFailureHandler.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/3785cc4c/modules/core/src/main/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandler.java b/modules/core/src/main/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandler.java index 3ce4ff6..879ddb0 100644 --- a/modules/core/src/main/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandler.java @@ -23,6 +23,7 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteLogger; import org.apache.ignite.Ignition; import org.apache.ignite.internal.IgnitionEx; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; /** @@ -99,4 +100,9 @@ public class StopNodeOrHaltFailureHandler implements FailureHandler { return true; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(StopNodeOrHaltFailureHandler.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/3785cc4c/modules/core/src/main/java/org/apache/ignite/internal/processors/failure/FailureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/failure/FailureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/failure/FailureProcessor.java index 0234e84..b11cb95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/failure/FailureProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/failure/FailureProcessor.java @@ -67,6 +67,8 @@ public class FailureProcessor extends GridProcessorAdapter { assert hnd != null; this.hnd = hnd; + + U.quietAndInfo(log, "Configured failure handler: [hnd=" + hnd + ']'); } /** @@ -107,8 +109,8 @@ public class FailureProcessor extends GridProcessorAdapter { if (this.failureCtx != null) // Node already terminating, no reason to process more errors. return; - U.error(ignite.log(), "Critical failure. Will be handled accordingly to configured handler [hnd=" + - hnd.getClass() + ", failureCtx=" + failureCtx + ']', failureCtx.error()); + U.error(ignite.log(), "Critical system error detected. Will be handled accordingly to configured handler " + + "[hnd=" + hnd.getClass() + ", failureCtx=" + failureCtx + ']', failureCtx.error()); if (reserveBuf != null && X.hasCause(failureCtx.error(), OutOfMemoryError.class)) reserveBuf = null;
