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 aj...@apache.org on 2019/03/22 23:21:09 UTC
[hadoop] branch trunk updated: Revert "HDDS-1310. In datanode once
a container becomes unhealthy,
datanode restart fails. Contributed by Sandeep Nemuri."
This is an automated email from the ASF dual-hosted git repository.
ajay 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 771ea6b Revert "HDDS-1310. In datanode once a container becomes unhealthy, datanode restart fails. Contributed by Sandeep Nemuri."
771ea6b is described below
commit 771ea6b5e788c0baf9fbc1e5de08e2dc21747c2a
Author: Ajay Kumar <aj...@apache.org>
AuthorDate: Fri Mar 22 16:20:44 2019 -0700
Revert "HDDS-1310. In datanode once a container becomes unhealthy, datanode restart fails. Contributed by Sandeep Nemuri."
This reverts commit efad5717ec1facbbe8a5a2c7adcaa47d5c1592ac.
---
.../hadoop/ozone/container/keyvalue/KeyValueContainer.java | 3 ---
.../ozone/container/keyvalue/TestKeyValueContainer.java | 13 -------------
2 files changed, 16 deletions(-)
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
index 26b0ce1..47af110 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
@@ -623,9 +623,6 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
case CLOSED:
state = ContainerReplicaProto.State.CLOSED;
break;
- case UNHEALTHY:
- state = ContainerReplicaProto.State.UNHEALTHY;
- break;
default:
throw new StorageContainerException("Invalid Container state found: " +
containerData.getContainerID(), INVALID_CONTAINER_STATE);
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
index 1aa7361..c7c08b0 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
@@ -333,19 +333,6 @@ public class TestKeyValueContainer {
}
@Test
- public void testReportOfUnhealthyContainer() throws Exception {
- keyValueContainer.create(volumeSet, volumeChoosingPolicy, scmId);
- Assert.assertNotNull(keyValueContainer.getContainerReport());
- keyValueContainer.markContainerUnhealthy();
- File containerFile = keyValueContainer.getContainerFile();
- keyValueContainerData = (KeyValueContainerData) ContainerDataYaml
- .readContainerFile(containerFile);
- assertEquals(ContainerProtos.ContainerDataProto.State.UNHEALTHY,
- keyValueContainerData.getState());
- Assert.assertNotNull(keyValueContainer.getContainerReport());
- }
-
- @Test
public void testUpdateContainer() throws IOException {
keyValueContainer.create(volumeSet, volumeChoosingPolicy, scmId);
Map<String, String> metadata = new HashMap<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org