This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 12419fae1f HDDS-11695. SCM follower should not log NotLeaderException
during Pipeline Report processing. (#7430)
12419fae1f is described below
commit 12419fae1f0418793d952227364b04f1d2c3583b
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Fri Nov 15 12:17:18 2024 +0530
HDDS-11695. SCM follower should not log NotLeaderException during Pipeline
Report processing. (#7430)
---
.../hdds/scm/pipeline/PipelineReportHandler.java | 47 +++++++++++++---------
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
index dcc7bdb3fb..b931f122a9 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.hdds.protocol.proto
import org.apache.hadoop.hdds.protocol.proto
.StorageContainerDatanodeProtocolProtos.PipelineReportsProto;
import org.apache.hadoop.hdds.scm.events.SCMEvents;
+import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.ha.SCMContext;
import org.apache.hadoop.hdds.scm.safemode.SafeModeManager;
import org.apache.hadoop.hdds.scm.server
@@ -91,35 +92,45 @@ public class PipelineReportHandler implements
for (PipelineReport report : pipelineReport.getPipelineReportList()) {
try {
processPipelineReport(report, dn, publisher);
- } catch (NotLeaderException ex) {
- // Avoid NotLeaderException logging which happens when processing
- // pipeline report on followers.
} catch (PipelineNotFoundException e) {
- LOGGER.error("Could not find pipeline {}", report.getPipelineID());
+ handlePipelineNotFoundException(report, dn, publisher);
} catch (IOException | TimeoutException e) {
- LOGGER.error("Could not process pipeline report={} from dn={}.",
- report, dn, e);
+ // Ignore NotLeaderException logging which happens when processing
+ // pipeline report on followers.
+ if (!isNotLeaderException(e)) {
+ LOGGER.error("Could not process pipeline report={} from dn={}.",
+ report, dn, e);
+ }
}
}
}
- protected void processPipelineReport(PipelineReport report,
- DatanodeDetails dn, EventPublisher publisher)
- throws IOException, TimeoutException {
- PipelineID pipelineID = PipelineID.getFromProtobuf(report.getPipelineID());
- Pipeline pipeline;
- try {
- pipeline = pipelineManager.getPipeline(pipelineID);
- } catch (PipelineNotFoundException e) {
- if (scmContext.isLeader()) {
- LOGGER.info("Reported pipeline {} is not found", pipelineID);
- SCMCommand< ? > command = new ClosePipelineCommand(pipelineID);
+ private void handlePipelineNotFoundException(final PipelineReport report,
+ final DatanodeDetails dn, final EventPublisher publisher) {
+ final PipelineID pipelineID =
PipelineID.getFromProtobuf(report.getPipelineID());
+ LOGGER.info("Pipeline {}, reported by datanode {} is not found.",
pipelineID, dn);
+ if (scmContext.isLeader()) {
+ try {
+ final SCMCommand<?> command = new ClosePipelineCommand(pipelineID);
command.setTerm(scmContext.getTermOfLeader());
publisher.fireEvent(SCMEvents.DATANODE_COMMAND,
new CommandForDatanode<>(dn.getUuid(), command));
+ } catch (NotLeaderException ex) {
+ // Do nothing if the leader has changed.
}
- return;
}
+ }
+
+ private static boolean isNotLeaderException(final Exception e) {
+ return e instanceof SCMException && ((SCMException) e).getResult().equals(
+ SCMException.ResultCodes.SCM_NOT_LEADER);
+ }
+
+ protected void processPipelineReport(PipelineReport report,
+ DatanodeDetails dn, EventPublisher publisher)
+ throws IOException, TimeoutException {
+ final PipelineID pipelineID =
PipelineID.getFromProtobuf(report.getPipelineID());
+ final Pipeline pipeline = pipelineManager.getPipeline(pipelineID);
setReportedDatanode(pipeline, dn);
setPipelineLeaderId(report, pipeline, dn);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
