big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDDS-48. Fix branch after merging from trunk.

Browse Source
This commit is contained in:
Bharat Viswanadham 2018-07-09 12:30:59 -07:00 committed by Arpit Agarwal
parent c275a9a6a0
commit 3584baf264
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java
View File

@ -34,9 +34,10 @@
import org.apache.hadoop.ozone.client.OzoneClientFactory; import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.OzoneVolume; import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream; import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.common.helpers.ContainerData; import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.hadoop.ozone.container.common.helpers.KeyUtils; import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
import org.apache.hadoop.ozone.container.common.impl.ContainerManagerImpl; import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
import org.apache.hadoop.ozone.container.keyvalue.helpers.KeyUtils;
import org.apache.hadoop.ozone.om.OzoneManager; import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs; import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
@ -46,6 +47,7 @@
import org.apache.hadoop.utils.MetadataStore; import org.apache.hadoop.utils.MetadataStore;
import org.junit.Assert; import org.junit.Assert;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import java.io.File; import java.io.File;
@ -56,10 +58,11 @@
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL;
@Ignore("Need to be fixed according to ContainerIO")
public class TestBlockDeletion { public class TestBlockDeletion {
private static OzoneConfiguration conf = null; private static OzoneConfiguration conf = null;
private static ObjectStore store; private static ObjectStore store;
private static ContainerManagerImpl dnContainerManager = null; private static ContainerSet dnContainerManager = null;
private static StorageContainerManager scm = null; private static StorageContainerManager scm = null;
private static OzoneManager om = null; private static OzoneManager om = null;
private static Set<Long> containerIdsWithDeletedBlocks; private static Set<Long> containerIdsWithDeletedBlocks;
@ -85,9 +88,8 @@ public static void init() throws Exception {
MiniOzoneCluster.newBuilder(conf).setNumDatanodes(1).build(); MiniOzoneCluster.newBuilder(conf).setNumDatanodes(1).build();
cluster.waitForClusterToBeReady(); cluster.waitForClusterToBeReady();
store = OzoneClientFactory.getRpcClient(conf).getObjectStore(); store = OzoneClientFactory.getRpcClient(conf).getObjectStore();
dnContainerManager = dnContainerManager = cluster.getHddsDatanodes().get(0)
(ContainerManagerImpl) cluster.getHddsDatanodes().get(0) .getDatanodeStateMachine().getContainer().getContainerSet();
.getDatanodeStateMachine().getContainer().getContainerManager();
om = cluster.getOzoneManager(); om = cluster.getOzoneManager();
scm = cluster.getStorageContainerManager(); scm = cluster.getStorageContainerManager();
containerIdsWithDeletedBlocks = new HashSet<>(); containerIdsWithDeletedBlocks = new HashSet<>();
@ -148,8 +150,8 @@ private void matchContainerTransactionIds() throws IOException {
Assert.assertEquals( Assert.assertEquals(
scm.getContainerInfo(containerId).getDeleteTransactionId(), 0); scm.getContainerInfo(containerId).getDeleteTransactionId(), 0);
} }
Assert.assertEquals(dnContainerManager.readContainer(containerId) Assert.assertEquals(dnContainerManager.getContainer(containerId)
.getDeleteTransactionId(), .getContainerData().getDeleteTransactionId(),
scm.getContainerInfo(containerId).getDeleteTransactionId()); scm.getContainerInfo(containerId).getDeleteTransactionId());
} }
} }
@ -159,9 +161,9 @@ private boolean verifyBlocksCreated(
throws IOException { throws IOException {
return performOperationOnKeyContainers((blockID) -> { return performOperationOnKeyContainers((blockID) -> {
try { try {
MetadataStore db = KeyUtils.getDB( MetadataStore db = KeyUtils.getDB((KeyValueContainerData)
dnContainerManager.getContainerMap().get(blockID.getContainerID()), dnContainerManager.getContainer(blockID.getContainerID())
conf); .getContainerData(), conf);
Assert.assertNotNull(db.get(Longs.toByteArray(blockID.getLocalID()))); Assert.assertNotNull(db.get(Longs.toByteArray(blockID.getLocalID())));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
@ -174,9 +176,9 @@ private boolean verifyBlocksDeleted(
throws IOException { throws IOException {
return performOperationOnKeyContainers((blockID) -> { return performOperationOnKeyContainers((blockID) -> {
try { try {
MetadataStore db = KeyUtils.getDB( MetadataStore db = KeyUtils.getDB((KeyValueContainerData)
dnContainerManager.getContainerMap().get(blockID.getContainerID()), dnContainerManager.getContainer(blockID.getContainerID())
conf); .getContainerData(), conf);
Assert.assertNull(db.get(Longs.toByteArray(blockID.getLocalID()))); Assert.assertNull(db.get(Longs.toByteArray(blockID.getLocalID())));
Assert.assertNull(db.get(DFSUtil.string2Bytes( Assert.assertNull(db.get(DFSUtil.string2Bytes(
OzoneConsts.DELETING_KEY_PREFIX + blockID.getLocalID()))); OzoneConsts.DELETING_KEY_PREFIX + blockID.getLocalID())));

4
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java
View File

@ -338,8 +338,8 @@ public void testInfoContainer() throws Exception {
openStatus = data.isOpen() ? "OPEN" : "CLOSED"; openStatus = data.isOpen() ? "OPEN" : "CLOSED";
expected = String expected = String
.format(formatStr, container.getContainerID(), openStatus, .format(formatStr, container.getContainerInfo().getContainerID(),
data.getDbFile().getPath(), data.getContainerPath(), "", openStatus, data.getDbFile().getPath(), data.getContainerPath(), "",
datanodeDetails.getHostName(), datanodeDetails.getHostName()); datanodeDetails.getHostName(), datanodeDetails.getHostName());
assertEquals(expected, out.toString()); assertEquals(expected, out.toString());
} }