Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1775 from gianm/retry-table-creation 

SQLMetadataConnector: Retry table creation, in case something goes wrong.
This commit is contained in:
Fangjin Yang 2015-09-24 22:24:03 -07:00
parent aa9d90355e 3aba401ee0
commit d60610ced3
4 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indexing-hadoop/src/test/java/io/druid/indexer/updater/HadoopConverterJobTest.java
View File

@ -232,7 +232,7 @@ public class HadoopConverterJobTest
@Override
public boolean run()
{
connector.createSegmentTable(connector.getDBI(), metadataStorageUpdaterJobSpec.getSegmentTable());
connector.createSegmentTable(metadataStorageUpdaterJobSpec.getSegmentTable());
return true;
}
},

39
server/src/main/java/io/druid/metadata/SQLMetadataConnector.java
View File

@ -151,10 +151,10 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
return false;
}
public void createTable(final IDBI dbi, final String tableName, final Iterable<String> sql)
public void createTable(final String tableName, final Iterable<String> sql)
{
try {
dbi.withHandle(
retryWithHandle(
new HandleCallback<Void>()
{
@Override
@ -180,10 +180,9 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
}
}
public void createSegmentTable(final IDBI dbi, final String tableName)
public void createSegmentTable(final String tableName)
{
createTable(
dbi,
tableName,
ImmutableList.of(
String.format(
@ -207,10 +206,9 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
);
}
public void createRulesTable(final IDBI dbi, final String tableName)
public void createRulesTable(final String tableName)
{
createTable(
dbi,
tableName,
ImmutableList.of(
String.format(
@ -228,10 +226,9 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
);
}
public void createConfigTable(final IDBI dbi, final String tableName)
public void createConfigTable(final String tableName)
{
createTable(
dbi,
tableName,
ImmutableList.of(
String.format(
@ -246,10 +243,9 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
);
}
public void createEntryTable(final IDBI dbi, final String tableName)
public void createEntryTable(final String tableName)
{
createTable(
dbi,
tableName,
ImmutableList.of(
String.format(
@ -269,10 +265,9 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
);
}
public void createLogTable(final IDBI dbi, final String tableName, final String entryTypeName)
public void createLogTable(final String tableName, final String entryTypeName)
{
createTable(
dbi,
tableName,
ImmutableList.of(
String.format(
@ -289,10 +284,9 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
);
}
public void createLockTable(final IDBI dbi, final String tableName, final String entryTypeName)
public void createLockTable(final String tableName, final String entryTypeName)
{
createTable(
dbi,
tableName,
ImmutableList.of(
String.format(
@ -363,21 +357,21 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
@Override
public void createSegmentTable() {
if (config.get().isCreateTables()) {
createSegmentTable(getDBI(), tablesConfigSupplier.get().getSegmentsTable());
createSegmentTable(tablesConfigSupplier.get().getSegmentsTable());
}
}
@Override
public void createRulesTable() {
if (config.get().isCreateTables()) {
createRulesTable(getDBI(), tablesConfigSupplier.get().getRulesTable());
createRulesTable(tablesConfigSupplier.get().getRulesTable());
}
}
@Override
public void createConfigTable() {
if (config.get().isCreateTables()) {
createConfigTable(getDBI(), tablesConfigSupplier.get().getConfigTable());
createConfigTable(tablesConfigSupplier.get().getConfigTable());
}
}
@ -386,9 +380,9 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
if (config.get().isCreateTables()) {
final MetadataStorageTablesConfig tablesConfig = tablesConfigSupplier.get();
final String entryType = tablesConfig.getTaskEntryType();
createEntryTable(getDBI(), tablesConfig.getEntryTable(entryType));
createLogTable(getDBI(), tablesConfig.getLogTable(entryType), entryType);
createLockTable(getDBI(), tablesConfig.getLockTable(entryType), entryType);
createEntryTable(tablesConfig.getEntryTable(entryType));
createLogTable(tablesConfig.getLogTable(entryType), entryType);
createLockTable(tablesConfig.getLockTable(entryType), entryType);
}
}
@ -446,10 +440,9 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
return dataSource;
}
private void createAuditTable(final IDBI dbi, final String tableName)
private void createAuditTable(final String tableName)
{
createTable(
dbi,
tableName,
ImmutableList.of(
String.format(
@ -474,7 +467,7 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
@Override
public void createAuditTable() {
if (config.get().isCreateTables()) {
createAuditTable(getDBI(), tablesConfigSupplier.get().getAuditTable());
createAuditTable(tablesConfigSupplier.get().getAuditTable());
}
}

2
server/src/test/java/io/druid/metadata/SQLMetadataConnectorTest.java
View File

@ -87,7 +87,7 @@ public class SQLMetadataConnectorTest
public void testInsertOrUpdate() throws Exception
{
final String tableName = "test";
connector.createConfigTable(connector.getDBI(), tableName);
connector.createConfigTable(tableName);
Assert.assertNull(connector.lookup(tableName, "name", "payload", "emperor"));

6
server/src/test/java/io/druid/metadata/SQLMetadataStorageActionHandlerTest.java
View File

@ -53,9 +53,9 @@ public class SQLMetadataStorageActionHandlerTest
final String lockTable = "locks";
connector.createEntryTable(connector.getDBI(), entryTable);
connector.createLockTable(connector.getDBI(), lockTable, entryType);
connector.createLogTable(connector.getDBI(), logTable, entryType);
connector.createEntryTable(entryTable);
connector.createLockTable(lockTable, entryType);
connector.createLogTable(logTable, entryType);
handler = new SQLMetadataStorageActionHandler<>(