[hadoop-ozone] branch master updated: HDDS-4304. Close Container event can fail if pipeline is removed first. (#1471)

[nanda]

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

nanda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git


The following commit(s) were added to refs/heads/master by this push:
     new 5719615  HDDS-4304. Close Container event can fail if pipeline is 
removed first. (#1471)
5719615 is described below

commit 5719615b932aff75d2fef25470e944885e14b8db
Author: Stephen O'Donnell <stephen.odonn...@gmail.com>
AuthorDate: Mon Oct 5 06:36:42 2020 +0100

    HDDS-4304. Close Container event can fail if pipeline is removed first. 
(#1471)
---
 .../hadoop/hdds/scm/container/SCMContainerManager.java       | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git 
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
 
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
index fa286a2..d56c47e 100644
--- 
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
+++ 
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
@@ -356,9 +356,15 @@ public class SCMContainerManager implements 
ContainerManager {
       if (!skipPipelineToContainerRemove) {
         if (oldState == LifeCycleState.OPEN &&
             newState != LifeCycleState.OPEN) {
-          pipelineManager
-              .removeContainerFromPipeline(container.getPipelineID(),
-                  containerID);
+          try {
+            pipelineManager
+                .removeContainerFromPipeline(container.getPipelineID(),
+                    containerID);
+          } catch (PipelineNotFoundException e) {
+            LOG.warn("Unable to remove container {} from pipeline {} " +
+                " as the pipeline no longer exists",
+                containerID, container.getPipelineID());
+          }
         }
       }
       if (newState == LifeCycleState.DELETED) {


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