Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-1028. Improve logging in SCMPipelineManager. Contributed by Lokesh Jain.

This commit is contained in:
Shashikant Banerjee 2019-02-15 14:38:38 +05:30
parent 75e15cc0c4
commit 8a426dc848
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/StaleNodeHandler.java
View File

@ -56,6 +56,8 @@ public void onMessage(DatanodeDetails datanodeDetails,
EventPublisher publisher) {
Set<PipelineID> pipelineIds =
nodeManager.getPipelines(datanodeDetails);
LOG.info("Datanode {} moved to stale state. Finalizing its pipelines {}",
datanodeDetails, pipelineIds);
for (PipelineID pipelineID : pipelineIds) {
try {
Pipeline pipeline = pipelineManager.getPipeline(pipelineID);

2
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineActionHandler.java
View File

@ -57,6 +57,8 @@ public void onMessage(PipelineActionsFromDatanode report,
pipelineID = PipelineID.
getFromProtobuf(action.getClosePipeline().getPipelineID());
Pipeline pipeline = pipelineManager.getPipeline(pipelineID);
LOG.info("Received pipeline action {} for {} from datanode [}",
action.getAction(), pipeline, report.getDatanodeDetails());
RatisPipelineUtils
.finalizeAndDestroyPipeline(pipelineManager, pipeline, ozoneConf,
true);

3
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
View File

@ -84,6 +84,7 @@ private void processPipelineReport(PipelineReport report, DatanodeDetails dn)
}
if (pipeline.getPipelineState() == Pipeline.PipelineState.ALLOCATED) {
LOGGER.info("Pipeline {} reported by {}", pipeline.getId(), dn);
pipeline.reportDatanode(dn);
if (pipeline.isHealthy()) {
// if all the dns have reported, pipeline can be moved to OPEN state
@ -94,6 +95,8 @@ private void processPipelineReport(PipelineReport report, DatanodeDetails dn)
if (numContainers == 0) {
// since all the containers have been closed the pipeline can be
// destroyed
LOGGER.info("Destroying pipeline {} as all containers are closed",
pipeline);
RatisPipelineUtils.destroyPipeline(pipelineManager, pipeline, conf);
}
} else {

14
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java
View File

@ -23,6 +23,8 @@
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline.PipelineState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.List;
@ -37,6 +39,9 @@
*/
class PipelineStateManager {
private static final Logger LOG =
LoggerFactory.getLogger(PipelineStateManager.class);
private final PipelineStateMap pipelineStateMap;
PipelineStateManager(Configuration conf) {
@ -45,6 +50,9 @@ class PipelineStateManager {
void addPipeline(Pipeline pipeline) throws IOException {
pipelineStateMap.addPipeline(pipeline);
if (pipeline.getPipelineState() == PipelineState.OPEN) {
LOG.info("Created pipeline " + pipeline);
}
}
void addContainerToPipeline(PipelineID pipelineId, ContainerID containerID)
@ -87,7 +95,9 @@ int getNumberOfContainers(PipelineID pipelineID) throws IOException {
}
Pipeline removePipeline(PipelineID pipelineID) throws IOException {
return pipelineStateMap.removePipeline(pipelineID);
Pipeline pipeline = pipelineStateMap.removePipeline(pipelineID);
LOG.info("Pipeline {} removed from db", pipeline);
return pipeline;
}
void removeContainerFromPipeline(PipelineID pipelineID,
@ -101,6 +111,7 @@ Pipeline finalizePipeline(PipelineID pipelineId)
if (!pipeline.isClosed()) {
pipeline = pipelineStateMap
.updatePipelineState(pipelineId, PipelineState.CLOSED);
LOG.info("Pipeline {} moved to CLOSED state", pipeline);
}
return pipeline;
}
@ -113,6 +124,7 @@ Pipeline openPipeline(PipelineID pipelineId) throws IOException {
if (pipeline.getPipelineState() == PipelineState.ALLOCATED) {
pipeline = pipelineStateMap
.updatePipelineState(pipelineId, PipelineState.OPEN);
LOG.info("Pipeline {} moved to OPEN state", pipeline.toString());
}
return pipeline;
}