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

HDFS-12391. Ozone: TestKSMSQLCli is not working as expected. Contributed by Weiwei Yang.

Browse Source
This commit is contained in:
Chen Liang 2017-09-05 11:14:33 -07:00 committed by Owen O'Malley
parent 1a21136322
commit e06a9a5bb1
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/cli/SQLCLI.java
View File

@ -346,7 +346,7 @@ private void convertKSMDB(Path dbPath, Path outPath) throws Exception {
LOG.info("Create tables for sql ksm db.");
File dbFile = dbPath.toFile();
try (MetadataStore dbStore = MetadataStoreBuilder.newBuilder()
.setDbFile(dbFile).build();
.setConf(conf).setDbFile(dbFile).build();
Connection conn = connectDB(outPath.toString())) {
executeSQL(conn, CREATE_VOLUME_LIST);
executeSQL(conn, CREATE_VOLUME_INFO);

41
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/ksm/TestKSMSQLCli.java
View File

@ -60,23 +60,23 @@
*/
@RunWith(Parameterized.class)
public class TestKSMSQLCli {
private static MiniOzoneCluster cluster = null;
private static StorageHandler storageHandler;
private static UserArgs userArgs;
private static OzoneConfiguration conf;
private static SQLCLI cli;
private MiniOzoneCluster cluster = null;
private StorageHandler storageHandler;
private UserArgs userArgs;
private OzoneConfiguration conf;
private SQLCLI cli;
private static String userName = "userTest";
private static String adminName = "adminTest";
private static String volumeName0 = "volumeTest0";
private static String volumeName1 = "volumeTest1";
private static String bucketName0 = "bucketTest0";
private static String bucketName1 = "bucketTest1";
private static String bucketName2 = "bucketTest2";
private static String keyName0 = "key0";
private static String keyName1 = "key1";
private static String keyName2 = "key2";
private static String keyName3 = "key3";
private String userName = "userTest";
private String adminName = "adminTest";
private String volumeName0 = "volumeTest0";
private String volumeName1 = "volumeTest1";
private String bucketName0 = "bucketTest0";
private String bucketName1 = "bucketTest1";
private String bucketName2 = "bucketTest2";
private String keyName0 = "key0";
private String keyName1 = "key1";
private String keyName2 = "key2";
private String keyName3 = "key3";
@Parameterized.Parameters
public static Collection<Object[]> data() {
@ -86,7 +86,7 @@ public static Collection<Object[]> data() {
});
}
private static String metaStoreType;
private String metaStoreType;
public TestKSMSQLCli(String type) {
metaStoreType = type;
@ -100,8 +100,8 @@ public TestKSMSQLCli(String type) {
*
* @throws IOException
*/
@BeforeClass
public static void setup() throws Exception {
@Before
public void setup() throws Exception {
conf = new OzoneConfiguration();
conf.set(OzoneConfigKeys.OZONE_HANDLER_TYPE_KEY,
OzoneConsts.OZONE_HANDLER_DISTRIBUTED);
@ -151,10 +151,7 @@ public static void setup() throws Exception {
stream.close();
cluster.shutdown();
}
@Before
public void init() throws Exception {
conf.set(OzoneConfigKeys.OZONE_METADATA_STORE_IMPL, metaStoreType);
cli = new SQLCLI(conf);
}