This is an automated email from the ASF dual-hosted git repository.
nanda pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 738fab3 HDDS-1754. getContainerWithPipeline fails with
PipelineNotFoundException. Contributed by Supratim Deka (#1081)
738fab3 is described below
commit 738fab3bff04ab0128146b401b4978d3d60ec97f
Author: supratimdeka <[email protected]>
AuthorDate: Fri Jul 12 10:31:48 2019 +0530
HDDS-1754. getContainerWithPipeline fails with PipelineNotFoundException.
Contributed by Supratim Deka (#1081)
---
.../java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java | 8 ++++++++
.../apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java
index 7b5c467..0ecfdac 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java
@@ -467,4 +467,12 @@ public class ContainerInfo implements
Comparator<ContainerInfo>,
return state == HddsProtos.LifeCycleState.OPEN
|| state == HddsProtos.LifeCycleState.CLOSING;
}
+
+ /**
+ * Check if a container is in Open state, but Close has not been initiated.
+ * @return true if Open, false otherwise.
+ */
+ public boolean isOpenNotClosing() {
+ return state == HddsProtos.LifeCycleState.OPEN;
+ }
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
index 6a875e6..769f3ef 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
@@ -238,7 +238,7 @@ public class SCMClientProtocolServer implements
getContainer(id);
final Pipeline pipeline;
- if (container.isOpen()) {
+ if (container.isOpenNotClosing()) {
// Ratis pipeline
pipeline = scm.getPipelineManager()
.getPipeline(container.getPipelineID());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
