From efb68a95907f6147f6ee9039d931f369a7f5757c Mon Sep 17 00:00:00 2001
From: Aryan Gupta <aryan.gupta@cloudera.com>
Date: Fri, 11 Apr 2025 01:32:06 +0530
Subject: [PATCH] HDDS-12801. SCM should remove pipeline before DN.

---
 .../apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
index fc8bb5432b87..4ef16766180b 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
@@ -446,7 +446,7 @@ public void openPipeline(PipelineID pipelineId)
    */
   protected void removePipeline(Pipeline pipeline)
       throws IOException {
-    pipelineFactory.close(pipeline.getType(), pipeline);
+    // Removing the pipeline from SCM.
     HddsProtos.PipelineID pipelineID = pipeline.getId().getProtobuf();
     acquireWriteLock();
     try {
@@ -457,6 +457,8 @@ protected void removePipeline(Pipeline pipeline)
     } finally {
       releaseWriteLock();
     }
+    // Firing pipeline close command to datanode.
+    pipelineFactory.close(pipeline.getType(), pipeline);
     LOG.info("Pipeline {} removed.", pipeline);
     metrics.incNumPipelineDestroyed();
   }