Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-12175. Ozone: Fix Leaking in TestStorageContainerManager#testRpcPermission. Contributed by Xiaoyu Yao.

This commit is contained in:
Anu Engineer 2017-07-21 21:06:12 -07:00 committed by Owen O'Malley
parent d05b44f417
commit d02a4e9dd1
1 changed files with 56 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java
View File

@ -20,24 +20,16 @@ package org.apache.hadoop.ozone;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
import org.apache.hadoop.ozone.scm.StorageContainerManager; import org.apache.hadoop.ozone.scm.StorageContainerManager;
import org.apache.hadoop.scm.client.ScmClient; import org.apache.hadoop.scm.client.ScmClient;
import org.apache.hadoop.scm.container.common.helpers.Pipeline; import org.apache.hadoop.scm.container.common.helpers.Pipeline;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Assert; import org.junit.Assert;
// TODO : We need this when we enable these tests back.
import org.junit.Test; import org.junit.Test;
import org.junit.BeforeClass;
import org.junit.After;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.scm.protocol.LocatedContainer;
import org.apache.hadoop.scm.protocolPB.StorageContainerLocationProtocolClientSideTranslatorPB;
import org.junit.rules.Timeout; import org.junit.rules.Timeout;
import org.mockito.Mockito; import org.mockito.Mockito;
@ -54,24 +46,9 @@ public class TestStorageContainerManager {
@Rule @Rule
public ExpectedException thrown = ExpectedException.none(); public ExpectedException thrown = ExpectedException.none();
private static MiniOzoneCluster cluster;
private static OzoneConfiguration conf;
private static StorageContainerLocationProtocolClientSideTranslatorPB
storageContainerLocationClient;
@Rule @Rule
public ExpectedException exception = ExpectedException.none(); public ExpectedException exception = ExpectedException.none();
@BeforeClass
public static void init() throws IOException {
conf = new OzoneConfiguration();
}
@After
public void shutdown() throws InterruptedException {
IOUtils.cleanup(null, storageContainerLocationClient, cluster);
}
@Test @Test
public void testRpcPermission() throws IOException { public void testRpcPermission() throws IOException {
// Test with default configuration // Test with default configuration
@ -91,9 +68,11 @@ public class TestStorageContainerManager {
private void testRpcPermissionWithConf( private void testRpcPermissionWithConf(
OzoneConfiguration ozoneConf, String fakeRemoteUsername, OzoneConfiguration ozoneConf, String fakeRemoteUsername,
boolean expectPermissionDenied) throws IOException { boolean expectPermissionDenied) throws IOException {
cluster = new MiniOzoneCluster.Builder(ozoneConf).numDataNodes(1) MiniOzoneCluster cluster =
new MiniOzoneCluster.Builder(ozoneConf).numDataNodes(1)
.setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build();
try {
String fakeUser = fakeRemoteUsername; String fakeUser = fakeRemoteUsername;
StorageContainerManager mockScm = Mockito.spy( StorageContainerManager mockScm = Mockito.spy(
cluster.getStorageContainerManager()); cluster.getStorageContainerManager());
@ -116,7 +95,7 @@ public class TestStorageContainerManager {
try { try {
Pipeline pipeLine2 = mockScm.allocateContainer("container2"); Pipeline pipeLine2 = mockScm.allocateContainer("container2");
if(expectPermissionDenied) { if (expectPermissionDenied) {
fail("Operation should fail, expecting an IOException here."); fail("Operation should fail, expecting an IOException here.");
} else { } else {
Assert.assertEquals("container2", pipeLine2.getContainerName()); Assert.assertEquals("container2", pipeLine2.getContainerName());
@ -128,7 +107,7 @@ public class TestStorageContainerManager {
try { try {
Pipeline pipeLine3 = mockScm.allocateContainer("container3", Pipeline pipeLine3 = mockScm.allocateContainer("container3",
ScmClient.ReplicationFactor.ONE); ScmClient.ReplicationFactor.ONE);
if(expectPermissionDenied) { if (expectPermissionDenied) {
fail("Operation should fail, expecting an IOException here."); fail("Operation should fail, expecting an IOException here.");
} else { } else {
Assert.assertEquals("container3", pipeLine3.getContainerName()); Assert.assertEquals("container3", pipeLine3.getContainerName());
@ -151,6 +130,9 @@ public class TestStorageContainerManager {
.contains("Specified key does not exist")); .contains("Specified key does not exist"));
} }
} }
} finally {
IOUtils.cleanup(null, cluster);
}
} }
private void verifyPermissionDeniedException(Exception e, String userName) { private void verifyPermissionDeniedException(Exception e, String userName) {