You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@ozone.apache.org by GitBox <gi...@apache.org> on 2020/07/06 07:13:37 UTC
[GitHub] [hadoop-ozone] timmylicheng commented on a change in pull request #1049: HDDS-3662 Decouple finalizeAndDestroyPipeline.
timmylicheng commented on a change in pull request #1049:
URL: https://github.com/apache/hadoop-ozone/pull/1049#discussion_r450025786
##########
File path: hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerV2Impl.java
##########
@@ -310,94 +321,72 @@ public void openPipeline(PipelineID pipelineId) throws IOException {
}
/**
- * Finalizes pipeline in the SCM. Removes pipeline and makes rpc call to
- * destroy pipeline on the datanodes immediately or after timeout based on the
- * value of onTimeout parameter.
- *
- * @param pipeline - Pipeline to be destroyed
- * @param onTimeout - if true pipeline is removed and destroyed on
- * datanodes after timeout
- * @throws IOException
- */
- @Override
- public void finalizeAndDestroyPipeline(Pipeline pipeline, boolean onTimeout)
- throws IOException {
- LOG.info("Destroying pipeline:{}", pipeline);
- finalizePipeline(pipeline.getId());
- if (onTimeout) {
- long pipelineDestroyTimeoutInMillis =
- conf.getTimeDuration(ScmConfigKeys.OZONE_SCM_PIPELINE_DESTROY_TIMEOUT,
- ScmConfigKeys.OZONE_SCM_PIPELINE_DESTROY_TIMEOUT_DEFAULT,
- TimeUnit.MILLISECONDS);
- scheduler.schedule(() -> destroyPipeline(pipeline),
- pipelineDestroyTimeoutInMillis, TimeUnit.MILLISECONDS, LOG,
- String.format("Destroy pipeline failed for pipeline:%s", pipeline));
- } else {
- destroyPipeline(pipeline);
- }
- }
-
- /**
- * Moves the pipeline to CLOSED state and sends close container command for
- * all the containers in the pipeline.
+ * Removes the pipeline from the db and pipeline state map.
*
- * @param pipelineId - ID of the pipeline to be moved to CLOSED state.
+ * @param pipeline - pipeline to be removed
* @throws IOException
*/
- private void finalizePipeline(PipelineID pipelineId) throws IOException {
+ protected void removePipeline(Pipeline pipeline) throws IOException {
+ pipelineFactory.close(pipeline.getType(), pipeline);
+ PipelineID pipelineID = pipeline.getId();
lock.writeLock().lock();
try {
- Pipeline pipeline = stateManager.getPipeline(pipelineId);
- if (!pipeline.isClosed()) {
- stateManager.updatePipelineState(
- pipelineId.getProtobuf(), HddsProtos.PipelineState.PIPELINE_CLOSED);
- LOG.info("Pipeline {} moved to CLOSED state", pipeline);
- }
-
- // TODO fire events to datanodes for closing pipelines
-// Set<ContainerID> containerIDs = stateManager.getContainers(pipelineId);
-// for (ContainerID containerID : containerIDs) {
-// eventPublisher.fireEvent(SCMEvents.CLOSE_CONTAINER, containerID);
-// }
- metrics.removePipelineMetrics(pipelineId);
+ closeContainersForPipeline(pipelineID);
Review comment:
Updated in PipelineManagerV2. That was a mistake. Thanks for the review
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org