Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HDDS-4027. Suppress ERROR message when SCM attempt to create addition… #1265

Merged
merged 1 commit into from
Jul 29, 2020
Merged

HDDS-4027. Suppress ERROR message when SCM attempt to create addition… #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions ...hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/SCMPipelineManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.events.SCMEvents;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.apache.hadoop.hdds.scm.safemode.SCMSafeModeManager.SafeModeStatus;
import org.apache.hadoop.hdds.server.events.EventPublisher;
Expand All @@ -56,6 +57,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static org.apache.hadoop.hdds.scm.exceptions.SCMException.ResultCodes.FAILED_TO_FIND_SUITABLE_NODE;

/**
* Implements api needed for management of pipelines. All the write operations
* for pipelines must come via PipelineManager. It synchronises all write
Expand Down Expand Up @@ -272,8 +275,15 @@ public Pipeline createPipeline(ReplicationType type,
recordMetricsForPipeline(pipeline);
return pipeline;
} catch (IOException ex) {
LOG.error("Failed to create pipeline of type {} and factor {}. " +
"Exception: {}", type, factor, ex.getMessage());
if (ex instanceof SCMException &&
((SCMException) ex).getResult() == FAILED_TO_FIND_SUITABLE_NODE) {
// Avoid spam SCM log with errors when SCM has enough open pipelines
LOG.debug("Can't create more pipelines of type {} and factor {}. " +
"Reason: {}", type, factor, ex.getMessage());
} else {
LOG.error("Failed to create pipeline of type {} and factor {}. " +
"Exception: {}", type, factor, ex.getMessage());
}
metrics.incNumPipelineCreationFailed();
throw ex;
} finally {
Expand Down
7 changes: 7 additions & 0 deletions .../server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.slf4j.event.Level.INFO;

/**
* Test cases to verify PipelineManager.
Expand Down Expand Up @@ -304,6 +305,8 @@ public void testPipelineCreationFailedMetric() throws Exception {
"NumPipelineCreationFailed", metrics);
Assert.assertEquals(0, numPipelineCreateFailed);

LogCapturer logs = LogCapturer.captureLogs(SCMPipelineManager.getLog());
GenericTestUtils.setLogLevel(SCMPipelineManager.getLog(), INFO);
//This should fail...
try {
pipelineManager.createPipeline(HddsProtos.ReplicationType.RATIS,
Expand All @@ -313,6 +316,10 @@ public void testPipelineCreationFailedMetric() throws Exception {
// pipeline creation failed this time.
Assert.assertEquals(SCMException.ResultCodes.FAILED_TO_FIND_SUITABLE_NODE,
ioe.getResult());
Assert.assertFalse(logs.getOutput().contains(
"Failed to create pipeline of type"));
} finally {
logs.stopCapturing();
}

metrics = getMetrics(
Expand Down