You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by sa...@apache.org on 2021/07/19 06:51:48 UTC

[ozone] branch master updated: HDDS-3740. PipelineStateManagerV2Impl#removePipeline will remove pipeline from db in case of failure (#2415)

This is an automated email from the ASF dual-hosted git repository.

sammichen 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 9081612  HDDS-3740. PipelineStateManagerV2Impl#removePipeline will remove pipeline from db in case of failure (#2415)
9081612 is described below

commit 9081612b01973e15c387f347a4ee8a90df649093
Author: Jackson Yao <ja...@tencent.com>
AuthorDate: Mon Jul 19 14:51:25 2021 +0800

    HDDS-3740. PipelineStateManagerV2Impl#removePipeline will remove pipeline from db in case of failure (#2415)
---
 .../apache/hadoop/hdds/scm/pipeline/PipelineStateManagerV2Impl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManagerV2Impl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManagerV2Impl.java
index 9ad3043..3f748e9 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManagerV2Impl.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManagerV2Impl.java
@@ -203,11 +203,11 @@ public class PipelineStateManagerV2Impl implements StateManager {
     lock.writeLock().lock();
     try {
       PipelineID pipelineID = PipelineID.getFromProtobuf(pipelineIDProto);
+      Pipeline pipeline = pipelineStateMap.removePipeline(pipelineID);
+      nodeManager.removePipeline(pipeline);
       if (pipelineStore != null) {
         transactionBuffer.removeFromBuffer(pipelineStore, pipelineID);
       }
-      Pipeline pipeline = pipelineStateMap.removePipeline(pipelineID);
-      nodeManager.removePipeline(pipeline);
       LOG.info("Pipeline {} removed.", pipeline);
     } catch (PipelineNotFoundException pnfe) {
       LOG.warn("Pipeline {} is not found in the pipeline Map. Pipeline"

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org