You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bh...@apache.org on 2019/01/17 01:43:52 UTC
[hadoop] branch trunk updated: HDDS-971. ContainerDataConstructor
throws exception on QUASI_CLOSED and UNHEALTHY container state. Contributed
by Lokesh Jain.
This is an automated email from the ASF dual-hosted git repository.
bharat 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 96ea464 HDDS-971. ContainerDataConstructor throws exception on QUASI_CLOSED and UNHEALTHY container state. Contributed by Lokesh Jain.
96ea464 is described below
commit 96ea464aaadeadc1ef149dab93813bcfd94fa21a
Author: Bharat Viswanadham <bh...@apache.org>
AuthorDate: Wed Jan 16 17:43:30 2019 -0800
HDDS-971. ContainerDataConstructor throws exception on QUASI_CLOSED and UNHEALTHY container state. Contributed by Lokesh Jain.
---
.../ozone/container/common/impl/ContainerDataYaml.java | 17 ++---------------
.../ozone/container/ozoneimpl/ContainerReader.java | 4 ++--
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java
index 2d09124..1571944 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java
@@ -256,21 +256,8 @@ public final class ContainerDataYaml {
kvData.setMetadata(meta);
kvData.setChecksum((String) nodes.get(OzoneConsts.CHECKSUM));
String state = (String) nodes.get(OzoneConsts.STATE);
- switch (state) {
- case "OPEN":
- kvData.setState(ContainerProtos.ContainerDataProto.State.OPEN);
- break;
- case "CLOSING":
- kvData.setState(ContainerProtos.ContainerDataProto.State.CLOSING);
- break;
- case "CLOSED":
- kvData.setState(ContainerProtos.ContainerDataProto.State.CLOSED);
- break;
- default:
- throw new IllegalStateException("Unexpected " +
- "ContainerLifeCycleState " + state + " for the containerId " +
- nodes.get(OzoneConsts.CONTAINER_ID));
- }
+ kvData
+ .setState(ContainerProtos.ContainerDataProto.State.valueOf(state));
return kvData;
}
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerReader.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerReader.java
index 43f78ed..0192fd5 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerReader.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerReader.java
@@ -96,8 +96,8 @@ public class ContainerReader implements Runnable {
try {
readVolume(hddsVolumeDir);
} catch (RuntimeException ex) {
- LOG.info("Caught an Run time exception during reading container files" +
- " from Volume {}", hddsVolumeDir);
+ LOG.error("Caught a Run time exception during reading container files" +
+ " from Volume {} {}", hddsVolumeDir, ex);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org