tkalkirill commented on code in PR #3248:
URL: https://github.com/apache/ignite-3/pull/3248#discussion_r1499014756
##########
modules/failure-handler/src/main/java/org/apache/ignite/internal/failure/FailureProcessor.java:
##########
@@ -115,7 +119,11 @@ private synchronized boolean process(FailureContext
failureCtx, FailureHandler h
return false;
}
- LOG.error(FAILURE_LOG_MSG + "[hnd=" + handler + ", failureCtx=" +
failureCtx + ']', failureCtx.error());
+ if (failureTypeIgnored(failureCtx, handler)) {
+ LOG.warn(IGNORED_FAILURE_LOG_MSG + "[hnd=" + handler + ",
failureCtx=" + failureCtx + ']', failureCtx.error());
Review Comment:
```suggestion
LOG.warn(IGNORED_FAILURE_LOG_MSG + "[hnd={}, failureCtx={}]",
failureCtx.error(), handler, failureCtx);
```
##########
modules/failure-handler/src/main/java/org/apache/ignite/internal/failure/handlers/AbstractFailureHandler.java:
##########
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.failure.handlers;
+
+import static
org.apache.ignite.internal.failure.FailureType.SYSTEM_CRITICAL_OPERATION_TIMEOUT;
+import static
org.apache.ignite.internal.failure.FailureType.SYSTEM_WORKER_BLOCKED;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+import org.apache.ignite.internal.failure.FailureContext;
+import org.apache.ignite.internal.failure.FailureType;
+import org.apache.ignite.internal.tostring.IgniteToStringInclude;
+import org.apache.ignite.internal.tostring.S;
+
+/**
+ * Abstract superclass for {@link FailureHandler} implementations. Maintains a
set of ignored failure types.
+ */
+public abstract class AbstractFailureHandler implements FailureHandler {
+ /** List of ignored failure types. */
+ @IgniteToStringInclude
+ private Set<FailureType> ignoredFailureTypes =
Review Comment:
```suggestion
private volatile Set<FailureType> ignoredFailureTypes =
```
##########
modules/failure-handler/src/main/java/org/apache/ignite/internal/failure/FailureProcessor.java:
##########
@@ -115,7 +119,11 @@ private synchronized boolean process(FailureContext
failureCtx, FailureHandler h
return false;
}
- LOG.error(FAILURE_LOG_MSG + "[hnd=" + handler + ", failureCtx=" +
failureCtx + ']', failureCtx.error());
+ if (failureTypeIgnored(failureCtx, handler)) {
+ LOG.warn(IGNORED_FAILURE_LOG_MSG + "[hnd=" + handler + ",
failureCtx=" + failureCtx + ']', failureCtx.error());
+ } else {
+ LOG.error(FAILURE_LOG_MSG + "[hnd=" + handler + ", failureCtx=" +
failureCtx + ']', failureCtx.error());
Review Comment:
```suggestion
LOG.error(FAILURE_LOG_MSG + "[hnd={}, failureCtx={}]",
failureCtx.error(), handler, failureCtx);
```
##########
modules/failure-handler/src/main/java/org/apache/ignite/internal/failure/handlers/AbstractFailureHandler.java:
##########
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.failure.handlers;
+
+import static
org.apache.ignite.internal.failure.FailureType.SYSTEM_CRITICAL_OPERATION_TIMEOUT;
+import static
org.apache.ignite.internal.failure.FailureType.SYSTEM_WORKER_BLOCKED;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+import org.apache.ignite.internal.failure.FailureContext;
+import org.apache.ignite.internal.failure.FailureType;
+import org.apache.ignite.internal.tostring.IgniteToStringInclude;
+import org.apache.ignite.internal.tostring.S;
+
+/**
+ * Abstract superclass for {@link FailureHandler} implementations. Maintains a
set of ignored failure types.
+ */
+public abstract class AbstractFailureHandler implements FailureHandler {
+ /** List of ignored failure types. */
+ @IgniteToStringInclude
+ private Set<FailureType> ignoredFailureTypes =
+ Collections.unmodifiableSet(EnumSet.of(SYSTEM_WORKER_BLOCKED,
SYSTEM_CRITICAL_OPERATION_TIMEOUT));
+
+ /**
+ * Sets failure types that must be ignored by failure handler.
+ *
+ * @param failureTypes Set of failure type that must be ignored.
+ * @see FailureType
+ */
+ public void ignoredFailureTypes(Set<FailureType> failureTypes) {
+ ignoredFailureTypes = Collections.unmodifiableSet(failureTypes);
+ }
+
+ /**
+ * Returns unmodifiable set of ignored failure types.
+ */
+ public Set<FailureType> ignoredFailureTypes() {
+ return ignoredFailureTypes;
+ }
+
+ @Override
+ public boolean onFailure(String nodeName, FailureContext failureCtx) {
+ return !ignoredFailureTypes.contains(failureCtx.type()) &&
handle(nodeName, failureCtx);
+ }
+
+ /**
+ * Actual failure handling. This method is not called for ignored failure
types.
+ *
+ * @see #ignoredFailureTypes(Set)
+ * @see FailureHandler#onFailure(String, FailureContext)
+ */
+ protected abstract boolean handle(String nodeName, FailureContext
failureCtx);
+
+ @Override public String toString() {
Review Comment:
```suggestion
@Override
public String toString() {
```
##########
modules/failure-handler/src/test/java/org/apache/ignite/internal/failure/FailureProcessorTest.java:
##########
@@ -49,4 +53,21 @@ void testFailureProcessing() {
failureProcessor.stop();
}
}
+
+ @Test
+ void testIgnoredFailureTypes() {
+ FailureHandler handler = new NoOpFailureHandler();
+
+ FailureProcessor failureProcessor = new FailureProcessor("node_name",
handler);
+
+ assertThat(failureProcessor.start(), willSucceedFast());
+
+ try {
+ assertThat(failureProcessor.process(new
FailureContext(SYSTEM_WORKER_BLOCKED, null)), is(false));
+
+ assertThat(failureProcessor.process(new
FailureContext(SYSTEM_CRITICAL_OPERATION_TIMEOUT, null)), is(false));
+ } finally {
+ failureProcessor.stop();
+ }
Review Comment:
```suggestion
try {
assertThat(failureProcessor.start(), willSucceedFast());
assertThat(failureProcessor.process(new
FailureContext(SYSTEM_WORKER_BLOCKED, null)), is(false));
assertThat(failureProcessor.process(new
FailureContext(SYSTEM_CRITICAL_OPERATION_TIMEOUT, null)), is(false));
} finally {
failureProcessor.stop();
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
