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

bug fix for using configurable default for datasource

This commit is contained in:
Fangjin Yang 2012-12-07 14:35:49 -08:00
parent 50a28f827e
commit f6519744e6
4 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java
View File

@ -53,7 +53,12 @@ import java.util.concurrent.atomic.AtomicReference;
*/
public class DatabaseRuleManager
{
public static void createDefaultRule(final DBI dbi, final String ruleTable, final ObjectMapper jsonMapper)
public static void createDefaultRule(
final DBI dbi,
final String ruleTable,
final String defaultDatasource,
final ObjectMapper jsonMapper
)
{
try {
dbi.withHandle(
@ -64,8 +69,9 @@ public class DatabaseRuleManager
{
List<Map<String, Object>> existing = handle.select(
String.format(
"SELECT id from %s where datasource='_default';",
ruleTable
"SELECT id from %s where datasource=%s;",
ruleTable,
defaultDatasource
)
);
@ -80,7 +86,6 @@ public class DatabaseRuleManager
"_default_tier"
)
);
final String dataSource = "_default";
final String version = new DateTime().toString();
handle.createStatement(
String.format(
@ -88,8 +93,8 @@ public class DatabaseRuleManager
ruleTable
)
)
.bind("id", String.format("%s_%s", dataSource, version))
.bind("dataSource", dataSource)
.bind("id", String.format("%s_%s", defaultDatasource, version))
.bind("dataSource", defaultDatasource)
.bind("version", version)
.bind("payload", jsonMapper.writeValueAsString(defaultRules))
.execute();

1
server/src/main/java/com/metamx/druid/db/DatabaseRuleManagerConfig.java
View File

@ -31,6 +31,7 @@ public abstract class DatabaseRuleManagerConfig
public abstract String getRuleTable();
@Config("druid.database.defaultDatasource")
@Default("_default")
public abstract String getDefaultDatasource();
@Config("druid.database.rules.poll.duration")

7
server/src/main/java/com/metamx/druid/http/MasterMain.java
View File

@ -132,7 +132,12 @@ public class MasterMain
databaseRuleManagerConfig,
dbi
);
DatabaseRuleManager.createDefaultRule(dbi, databaseRuleManagerConfig.getRuleTable(), jsonMapper);
DatabaseRuleManager.createDefaultRule(
dbi,
databaseRuleManagerConfig.getRuleTable(),
databaseRuleManagerConfig.getDefaultDatasource(),
jsonMapper
);
final ScheduledExecutorService globalScheduledExec = scheduledExecutorFactory.create(1, "Global--%d");
final MonitorScheduler healthMonitor = new MonitorScheduler(

59
server/src/main/java/com/metamx/druid/utils/DruidSetup.java
View File

@ -128,22 +128,26 @@ public class DruidSetup
InputStream is = null;
try {
is = new FileInputStream(pfile);
} catch (FileNotFoundException e) {
}
catch (FileNotFoundException e) {
System.err.println("File not found: " + pfile);
System.err.println("No changes made.");
System.exit(4);
} catch (IOException ioe) {
}
catch (IOException ioe) {
reportErrorAndExit(pfile, ioe);
}
try {
props.load(is);
} catch (IOException e) {
}
catch (IOException e) {
reportErrorAndExit(pfile, e);
} finally {
}
finally {
Closeables.closeQuietly(is);
}
if (! Initialization.validateResolveProps(props)) { // bail, errors have been emitted
if (!Initialization.validateResolveProps(props)) { // bail, errors have been emitted
System.exit(9);
}
@ -152,14 +156,16 @@ public class DruidSetup
for (String pname : Initialization.SUB_PATH_PROPS) {
System.out.println(" " + pname + "=" + props.getProperty(pname));
}
System.out.println(" " + "druid.zk.paths.propertiesPath" + "=" +
props.getProperty("druid.zk.paths.propertiesPath"));
System.out.println(
" " + "druid.zk.paths.propertiesPath" + "=" +
props.getProperty("druid.zk.paths.propertiesPath")
);
}
/**
* @param zkClient zookeeper client.
* @param zpathBase znode base path.
* @param zpathBase znode base path.
* @param zkConnect ZK coordinates in the form host1:port1[,host2:port2[, ...]]
* @param out
*/
@ -172,7 +178,8 @@ public class DruidSetup
out.println("# Begin Properties Listing for zkConnect=" + zkConnect + " zpath=" + propPath);
try {
currProps.store(out, "Druid");
} catch (IOException ignored) {
}
catch (IOException ignored) {
}
out.println("# End Properties Listing for zkConnect=" + zkConnect + " zpath=" + propPath);
out.println("# NOTE: properties like druid.zk.paths.*Path are always stored in zookeeper in absolute form.");
@ -205,10 +212,10 @@ public class DruidSetup
}
/**
* @param zkClient zookeeper client.
* @param zpathBase znode base path.
* @param props the properties to store.
* @param out the PrintStream for human readable update summary (usually System.out).
* @param zkClient zookeeper client.
* @param zpathBase znode base path.
* @param props the properties to store.
* @param out the PrintStream for human readable update summary (usually System.out).
*/
private static void updatePropertiesZK(ZkClient zkClient, String zpathBase, Properties props, PrintStream out)
{
@ -231,7 +238,9 @@ public class DruidSetup
String currMetaPropVal = "";
StringBuilder changes = new StringBuilder(1024);
for (String pname : props.stringPropertyNames()) {
if (pname.equals(PropertiesZkSerializer.META_PROP)) continue; // ignore meta prop datestamp, if any
if (pname.equals(PropertiesZkSerializer.META_PROP)) {
continue; // ignore meta prop datestamp, if any
}
final String pvalue = props.getProperty(pname);
final String pvalueCurr = currProps.getProperty(pname);
if (pvalueCurr == null) {
@ -242,7 +251,7 @@ public class DruidSetup
} else {
countDiffer++;
changes.append("CHANGED: ").append(pname).append("= PREV=").append(pvalueCurr)
.append(" NOW=").append(pvalue).append("\n");
.append(" NOW=").append(pvalue).append("\n");
}
}
}
@ -257,7 +266,8 @@ public class DruidSetup
}
}
if (countNew + countRemoved + countDiffer > 0) {
out.println("Current properties differ: "
out.println(
"Current properties differ: "
+ countNew + " new, "
+ countDiffer + " different values, "
+ countRemoved + " removed, "
@ -281,9 +291,9 @@ public class DruidSetup
}
/**
* @param zkClient zookeeper client.
* @param zpathBase znode base path.
* @param out the PrintStream for human readable update summary.
* @param zkClient zookeeper client.
* @param zpathBase znode base path.
* @param out the PrintStream for human readable update summary.
*/
private static void createZNodes(ZkClient zkClient, String zpathBase, PrintStream out)
{
@ -332,6 +342,7 @@ public class DruidSetup
final String dbConnectionUrl = tmp_props.getProperty("druid.database.connectURI");
final String username = tmp_props.getProperty("druid.database.user");
final String password = tmp_props.getProperty("druid.database.password");
final String defaultDatasource = tmp_props.getProperty("druid.database.defaultDatasource", "_default");
//
// validation
@ -383,7 +394,12 @@ public class DruidSetup
DbConnector.createSegmentTable(dbConnector.getDBI(), tableName);
DbConnector.createRuleTable(dbConnector.getDBI(), ruleTableName);
DatabaseRuleManager.createDefaultRule(dbConnector.getDBI(), ruleTableName, new DefaultObjectMapper());
DatabaseRuleManager.createDefaultRule(
dbConnector.getDBI(),
ruleTableName,
defaultDatasource,
new DefaultObjectMapper()
);
}
/**
@ -391,7 +407,8 @@ public class DruidSetup
*/
private static void printUsage()
{
System.out.println("Usage: <java invocation> CMD [args]\n"
System.out.println(
"Usage: <java invocation> CMD [args]\n"
+ " Where CMD is a particular command:\n"
+ " CMD choices:\n"
+ " dump zkConnect baseZkPath # dump info from zk at given coordinates\n"