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 ae...@apache.org on 2017/04/17 17:28:40 UTC
[41/50] hadoop git commit: HDFS-11642. Block Storage: fix
TestCBlockCLI and TestCBlockServerPersistence cleanup. Contributed by Xiaoyu
Yao.
HDFS-11642. Block Storage: fix TestCBlockCLI and TestCBlockServerPersistence cleanup. Contributed by Xiaoyu Yao.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cedacf12
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cedacf12
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cedacf12
Branch: refs/heads/HDFS-7240
Commit: cedacf12c907172f1345b0b7fc2a5823c4ec610c
Parents: f4dec00
Author: Chen Liang <cl...@apache.org>
Authored: Wed Apr 12 12:09:10 2017 -0700
Committer: Chen Liang <cl...@apache.org>
Committed: Wed Apr 12 12:09:10 2017 -0700
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/cblock/TestCBlockServer.java | 1 +
.../org/apache/hadoop/cblock/TestCBlockServerPersistence.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cedacf12/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockServer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockServer.java
index 4f816e1..1efef3e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockServer.java
@@ -46,6 +46,7 @@ public class TestCBlockServer {
ScmClient storageClient = new MockStorageClient();
conf = new OzoneConfiguration();
cBlockManager = new CBlockManager(conf, storageClient);
+ cBlockManager.start();
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cedacf12/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockServerPersistence.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockServerPersistence.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockServerPersistence.java
index 3e212d5..0dee7bb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockServerPersistence.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockServerPersistence.java
@@ -66,6 +66,7 @@ public class TestCBlockServerPersistence {
try {
ScmClient storageClient = new MockStorageClient();
cBlockManager = new CBlockManager(conf, storageClient);
+ cBlockManager.start();
cBlockManager.createVolume(userName, volumeName1, volumeSize1, blockSize);
cBlockManager.createVolume(userName, volumeName2, volumeSize2, blockSize);
List<VolumeDescriptor> allVolumes = cBlockManager.getAllVolumes();
@@ -86,6 +87,7 @@ public class TestCBlockServerPersistence {
conf1.set(DFS_CBLOCK_SERVICE_LEVELDB_PATH_KEY, path.concat(
"/testCblockPersistence.dat"));
cBlockManager1 = new CBlockManager(conf1, storageClient1);
+ cBlockManager1.start();
List<VolumeDescriptor> allVolumes1 = cBlockManager1.getAllVolumes();
assertEquals(2, allVolumes1.size());
VolumeDescriptor newvolumeDescriptor1 = allVolumes1.get(0);
@@ -113,6 +115,9 @@ public class TestCBlockServerPersistence {
cBlockManager.clean();
}
if (cBlockManager1 != null) {
+ cBlockManager1.close();
+ cBlockManager1.stop();
+ cBlockManager1.join();
cBlockManager1.clean();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org