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

fix pushing down too many properties

This commit is contained in:
fjy 2013-06-06 17:58:40 -07:00
parent d5b7e644b6
commit 14f9b0409e
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ForkingTaskRunner.java
View File

@ -155,6 +155,8 @@ public class ForkingTaskRunner implements TaskRunner, TaskLogProvider
);
for (String propName : props.stringPropertyNames()) {
for (String allowedPrefix : config.getAllowedPrefixes()) {
if (propName.startsWith(allowedPrefix)) {
command.add(
String.format(
"-D%s=%s",
@ -163,6 +165,8 @@ public class ForkingTaskRunner implements TaskRunner, TaskLogProvider
)
);
}
}
}
// Override child JVM specific properties
for (String propName : props.stringPropertyNames()) {

10
indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/config/ForkingTaskRunnerConfig.java
View File

@ -1,10 +1,14 @@
package com.metamx.druid.indexing.coordinator.config;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.metamx.druid.indexing.worker.executor.ExecutorMain;
import org.skife.config.Config;
import org.skife.config.Default;
import java.io.File;
import java.util.List;
import java.util.Set;
public abstract class ForkingTaskRunnerConfig
{
@ -35,4 +39,10 @@ public abstract class ForkingTaskRunnerConfig
@Config("druid.indexer.fork.startport")
public abstract int getStartPort();
@Config("druid.indexer.properties.prefixes")
public List<String> getAllowedPrefixes()
{
return Lists.newArrayList("com.metamx", "druid");
}
}