HDFS-11979. Ozone: TestContainerPersistence never uses MiniOzoneCluster. Contributed by Tsz Wo Nicholas Sze.

This commit is contained in:
Anu Engineer 2017-06-15 10:33:09 -07:00 committed by Owen O'Malley
parent 03606dd1a8
commit 721e7a6418

View File

@ -21,7 +21,6 @@
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdfs.ozone.protocol.proto.ContainerProtos; import org.apache.hadoop.hdfs.ozone.protocol.proto.ContainerProtos;
import org.apache.hadoop.hdfs.server.datanode.StorageLocation; import org.apache.hadoop.hdfs.server.datanode.StorageLocation;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.OzoneConfiguration; import org.apache.hadoop.ozone.OzoneConfiguration;
import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.OzoneConsts;
@ -86,7 +85,6 @@ public class TestContainerPersistence {
private static ChunkManagerImpl chunkManager; private static ChunkManagerImpl chunkManager;
private static KeyManagerImpl keyManager; private static KeyManagerImpl keyManager;
private static OzoneConfiguration conf; private static OzoneConfiguration conf;
private static MiniOzoneCluster cluster;
private static List<StorageLocation> pathLists = new LinkedList<>(); private static List<StorageLocation> pathLists = new LinkedList<>();
@BeforeClass @BeforeClass
@ -104,8 +102,6 @@ public static void init() throws Throwable {
} }
Assert.assertTrue(containerDir.mkdirs()); Assert.assertTrue(containerDir.mkdirs());
cluster = new MiniOzoneCluster.Builder(conf)
.setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build();
containerManager = new ContainerManagerImpl(); containerManager = new ContainerManagerImpl();
chunkManager = new ChunkManagerImpl(containerManager); chunkManager = new ChunkManagerImpl(containerManager);
containerManager.setChunkManager(chunkManager); containerManager.setChunkManager(chunkManager);
@ -116,9 +112,6 @@ public static void init() throws Throwable {
@AfterClass @AfterClass
public static void shutdown() throws IOException { public static void shutdown() throws IOException {
if(cluster != null) {
cluster.shutdown();
}
FileUtils.deleteDirectory(new File(path)); FileUtils.deleteDirectory(new File(path));
} }