diff --git a/examples/conf/druid/auto/_common/common.jvm.config b/examples/conf/druid/auto/_common/common.jvm.config index fd74cf358979..0c488a2bceaf 100644 --- a/examples/conf/druid/auto/_common/common.jvm.config +++ b/examples/conf/druid/auto/_common/common.jvm.config @@ -1,6 +1,5 @@ -server -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/cluster/master/coordinator-overlord/jvm.config b/examples/conf/druid/cluster/master/coordinator-overlord/jvm.config index 5df7d606725a..00cfa42c6300 100644 --- a/examples/conf/druid/cluster/master/coordinator-overlord/jvm.config +++ b/examples/conf/druid/cluster/master/coordinator-overlord/jvm.config @@ -2,7 +2,6 @@ -Xms15g -Xmx15g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/cluster/query/router/jvm.config b/examples/conf/druid/cluster/query/router/jvm.config index a844c40b1eac..8fd91200735b 100644 --- a/examples/conf/druid/cluster/query/router/jvm.config +++ b/examples/conf/druid/cluster/query/router/jvm.config @@ -1,7 +1,6 @@ -server -Xms1g -Xmx1g --XX:+UseG1GC -XX:MaxDirectMemorySize=128m -XX:+ExitOnOutOfMemoryError -Duser.timezone=UTC diff --git a/examples/conf/druid/single-server/large/broker/jvm.config b/examples/conf/druid/single-server/large/broker/jvm.config index 6c43c24dbb4b..f554b705e101 100644 --- a/examples/conf/druid/single-server/large/broker/jvm.config +++ b/examples/conf/druid/single-server/large/broker/jvm.config @@ -3,7 +3,6 @@ -Xmx12g -XX:MaxDirectMemorySize=11g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/large/coordinator-overlord/jvm.config b/examples/conf/druid/single-server/large/coordinator-overlord/jvm.config index 5df7d606725a..00cfa42c6300 100644 --- a/examples/conf/druid/single-server/large/coordinator-overlord/jvm.config +++ b/examples/conf/druid/single-server/large/coordinator-overlord/jvm.config @@ -2,7 +2,6 @@ -Xms15g -Xmx15g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/large/historical/jvm.config b/examples/conf/druid/single-server/large/historical/jvm.config index 16e1f5d7825b..8b105559b007 100644 --- a/examples/conf/druid/single-server/large/historical/jvm.config +++ b/examples/conf/druid/single-server/large/historical/jvm.config @@ -3,7 +3,6 @@ -Xmx16g -XX:MaxDirectMemorySize=25g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/large/middleManager/jvm.config b/examples/conf/druid/single-server/large/middleManager/jvm.config index 82597e0b956b..69d307c31207 100644 --- a/examples/conf/druid/single-server/large/middleManager/jvm.config +++ b/examples/conf/druid/single-server/large/middleManager/jvm.config @@ -2,7 +2,6 @@ -Xms256m -Xmx256m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/large/router/jvm.config b/examples/conf/druid/single-server/large/router/jvm.config index a844c40b1eac..8fd91200735b 100644 --- a/examples/conf/druid/single-server/large/router/jvm.config +++ b/examples/conf/druid/single-server/large/router/jvm.config @@ -1,7 +1,6 @@ -server -Xms1g -Xmx1g --XX:+UseG1GC -XX:MaxDirectMemorySize=128m -XX:+ExitOnOutOfMemoryError -Duser.timezone=UTC diff --git a/examples/conf/druid/single-server/medium/broker/jvm.config b/examples/conf/druid/single-server/medium/broker/jvm.config index a4bf3d910971..a2cbe7908783 100644 --- a/examples/conf/druid/single-server/medium/broker/jvm.config +++ b/examples/conf/druid/single-server/medium/broker/jvm.config @@ -3,7 +3,6 @@ -Xmx8g -XX:MaxDirectMemorySize=5g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/medium/coordinator-overlord/jvm.config b/examples/conf/druid/single-server/medium/coordinator-overlord/jvm.config index dbddd50ce8d0..485137ad3d89 100644 --- a/examples/conf/druid/single-server/medium/coordinator-overlord/jvm.config +++ b/examples/conf/druid/single-server/medium/coordinator-overlord/jvm.config @@ -2,7 +2,6 @@ -Xms9g -Xmx9g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/medium/historical/jvm.config b/examples/conf/druid/single-server/medium/historical/jvm.config index f31ae92ba9fc..891312f3c689 100644 --- a/examples/conf/druid/single-server/medium/historical/jvm.config +++ b/examples/conf/druid/single-server/medium/historical/jvm.config @@ -3,7 +3,6 @@ -Xmx8g -XX:MaxDirectMemorySize=13g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/medium/middleManager/jvm.config b/examples/conf/druid/single-server/medium/middleManager/jvm.config index 82597e0b956b..69d307c31207 100644 --- a/examples/conf/druid/single-server/medium/middleManager/jvm.config +++ b/examples/conf/druid/single-server/medium/middleManager/jvm.config @@ -2,7 +2,6 @@ -Xms256m -Xmx256m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/medium/router/jvm.config b/examples/conf/druid/single-server/medium/router/jvm.config index 6fc9b4cdfefc..ebecad4435eb 100644 --- a/examples/conf/druid/single-server/medium/router/jvm.config +++ b/examples/conf/druid/single-server/medium/router/jvm.config @@ -1,7 +1,6 @@ -server -Xms512m -Xmx512m --XX:+UseG1GC -XX:MaxDirectMemorySize=128m -XX:+ExitOnOutOfMemoryError -Duser.timezone=UTC diff --git a/examples/conf/druid/single-server/micro-quickstart/broker/jvm.config b/examples/conf/druid/single-server/micro-quickstart/broker/jvm.config index cf72e5d2df9b..5d666f6db234 100644 --- a/examples/conf/druid/single-server/micro-quickstart/broker/jvm.config +++ b/examples/conf/druid/single-server/micro-quickstart/broker/jvm.config @@ -3,7 +3,6 @@ -Xmx512m -XX:MaxDirectMemorySize=768m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/micro-quickstart/coordinator-overlord/jvm.config b/examples/conf/druid/single-server/micro-quickstart/coordinator-overlord/jvm.config index 8ab5708c320c..aae520d8325f 100644 --- a/examples/conf/druid/single-server/micro-quickstart/coordinator-overlord/jvm.config +++ b/examples/conf/druid/single-server/micro-quickstart/coordinator-overlord/jvm.config @@ -2,7 +2,6 @@ -Xms256m -Xmx256m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/micro-quickstart/historical/jvm.config b/examples/conf/druid/single-server/micro-quickstart/historical/jvm.config index 8747402e85aa..79edb06e2030 100644 --- a/examples/conf/druid/single-server/micro-quickstart/historical/jvm.config +++ b/examples/conf/druid/single-server/micro-quickstart/historical/jvm.config @@ -3,7 +3,6 @@ -Xmx512m -XX:MaxDirectMemorySize=1280m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/micro-quickstart/middleManager/jvm.config b/examples/conf/druid/single-server/micro-quickstart/middleManager/jvm.config index 30b023cfb8db..8a650fb358c9 100644 --- a/examples/conf/druid/single-server/micro-quickstart/middleManager/jvm.config +++ b/examples/conf/druid/single-server/micro-quickstart/middleManager/jvm.config @@ -2,7 +2,6 @@ -Xms64m -Xmx64m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/micro-quickstart/router/jvm.config b/examples/conf/druid/single-server/micro-quickstart/router/jvm.config index e74d6b1375f4..b822f4601790 100644 --- a/examples/conf/druid/single-server/micro-quickstart/router/jvm.config +++ b/examples/conf/druid/single-server/micro-quickstart/router/jvm.config @@ -1,7 +1,6 @@ -server -Xms128m -Xmx128m --XX:+UseG1GC -XX:MaxDirectMemorySize=128m -XX:+ExitOnOutOfMemoryError -Duser.timezone=UTC diff --git a/examples/conf/druid/single-server/nano-quickstart/broker/jvm.config b/examples/conf/druid/single-server/nano-quickstart/broker/jvm.config index 8551ec59fb00..93d33903541e 100644 --- a/examples/conf/druid/single-server/nano-quickstart/broker/jvm.config +++ b/examples/conf/druid/single-server/nano-quickstart/broker/jvm.config @@ -3,7 +3,6 @@ -Xmx512m -XX:MaxDirectMemorySize=400m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/nano-quickstart/coordinator-overlord/jvm.config b/examples/conf/druid/single-server/nano-quickstart/coordinator-overlord/jvm.config index 8ab5708c320c..aae520d8325f 100644 --- a/examples/conf/druid/single-server/nano-quickstart/coordinator-overlord/jvm.config +++ b/examples/conf/druid/single-server/nano-quickstart/coordinator-overlord/jvm.config @@ -2,7 +2,6 @@ -Xms256m -Xmx256m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/nano-quickstart/historical/jvm.config b/examples/conf/druid/single-server/nano-quickstart/historical/jvm.config index 8551ec59fb00..93d33903541e 100644 --- a/examples/conf/druid/single-server/nano-quickstart/historical/jvm.config +++ b/examples/conf/druid/single-server/nano-quickstart/historical/jvm.config @@ -3,7 +3,6 @@ -Xmx512m -XX:MaxDirectMemorySize=400m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/nano-quickstart/middleManager/jvm.config b/examples/conf/druid/single-server/nano-quickstart/middleManager/jvm.config index 30b023cfb8db..8a650fb358c9 100644 --- a/examples/conf/druid/single-server/nano-quickstart/middleManager/jvm.config +++ b/examples/conf/druid/single-server/nano-quickstart/middleManager/jvm.config @@ -2,7 +2,6 @@ -Xms64m -Xmx64m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/nano-quickstart/router/jvm.config b/examples/conf/druid/single-server/nano-quickstart/router/jvm.config index e74d6b1375f4..b822f4601790 100644 --- a/examples/conf/druid/single-server/nano-quickstart/router/jvm.config +++ b/examples/conf/druid/single-server/nano-quickstart/router/jvm.config @@ -1,7 +1,6 @@ -server -Xms128m -Xmx128m --XX:+UseG1GC -XX:MaxDirectMemorySize=128m -XX:+ExitOnOutOfMemoryError -Duser.timezone=UTC diff --git a/examples/conf/druid/single-server/small/broker/jvm.config b/examples/conf/druid/single-server/small/broker/jvm.config index 1017bce2ab52..1bc85dd7702b 100644 --- a/examples/conf/druid/single-server/small/broker/jvm.config +++ b/examples/conf/druid/single-server/small/broker/jvm.config @@ -3,7 +3,6 @@ -Xmx4g -XX:MaxDirectMemorySize=3g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/small/coordinator-overlord/jvm.config b/examples/conf/druid/single-server/small/coordinator-overlord/jvm.config index 34176680c418..2d9b10d9501d 100644 --- a/examples/conf/druid/single-server/small/coordinator-overlord/jvm.config +++ b/examples/conf/druid/single-server/small/coordinator-overlord/jvm.config @@ -2,7 +2,6 @@ -Xms4500m -Xmx4500m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/small/historical/jvm.config b/examples/conf/druid/single-server/small/historical/jvm.config index 219060784712..a567647d543f 100644 --- a/examples/conf/druid/single-server/small/historical/jvm.config +++ b/examples/conf/druid/single-server/small/historical/jvm.config @@ -3,7 +3,6 @@ -Xmx4g -XX:MaxDirectMemorySize=8g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/small/middleManager/jvm.config b/examples/conf/druid/single-server/small/middleManager/jvm.config index a58621864370..c145532ba1ed 100644 --- a/examples/conf/druid/single-server/small/middleManager/jvm.config +++ b/examples/conf/druid/single-server/small/middleManager/jvm.config @@ -2,7 +2,6 @@ -Xms128m -Xmx128m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/small/router/jvm.config b/examples/conf/druid/single-server/small/router/jvm.config index ad8a52de508c..ebecad4435eb 100644 --- a/examples/conf/druid/single-server/small/router/jvm.config +++ b/examples/conf/druid/single-server/small/router/jvm.config @@ -1,10 +1,8 @@ -server -Xms512m -Xmx512m --XX:+UseG1GC -XX:MaxDirectMemorySize=128m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/xlarge/broker/jvm.config b/examples/conf/druid/single-server/xlarge/broker/jvm.config index f83ad0e18b61..b683fd7dd7aa 100644 --- a/examples/conf/druid/single-server/xlarge/broker/jvm.config +++ b/examples/conf/druid/single-server/xlarge/broker/jvm.config @@ -3,7 +3,6 @@ -Xmx16g -XX:MaxDirectMemorySize=12g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/xlarge/coordinator-overlord/jvm.config b/examples/conf/druid/single-server/xlarge/coordinator-overlord/jvm.config index f3ca0fdbb9ec..68f9f93c60d8 100644 --- a/examples/conf/druid/single-server/xlarge/coordinator-overlord/jvm.config +++ b/examples/conf/druid/single-server/xlarge/coordinator-overlord/jvm.config @@ -2,7 +2,6 @@ -Xms18g -Xmx18g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/xlarge/historical/jvm.config b/examples/conf/druid/single-server/xlarge/historical/jvm.config index 92553d3c8b41..6d91df0aef0b 100644 --- a/examples/conf/druid/single-server/xlarge/historical/jvm.config +++ b/examples/conf/druid/single-server/xlarge/historical/jvm.config @@ -3,7 +3,6 @@ -Xmx24g -XX:MaxDirectMemorySize=44g -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/xlarge/middleManager/jvm.config b/examples/conf/druid/single-server/xlarge/middleManager/jvm.config index 82597e0b956b..69d307c31207 100644 --- a/examples/conf/druid/single-server/xlarge/middleManager/jvm.config +++ b/examples/conf/druid/single-server/xlarge/middleManager/jvm.config @@ -2,7 +2,6 @@ -Xms256m -Xmx256m -XX:+ExitOnOutOfMemoryError --XX:+UseG1GC -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Djava.io.tmpdir=var/tmp diff --git a/examples/conf/druid/single-server/xlarge/router/jvm.config b/examples/conf/druid/single-server/xlarge/router/jvm.config index a844c40b1eac..8fd91200735b 100644 --- a/examples/conf/druid/single-server/xlarge/router/jvm.config +++ b/examples/conf/druid/single-server/xlarge/router/jvm.config @@ -1,7 +1,6 @@ -server -Xms1g -Xmx1g --XX:+UseG1GC -XX:MaxDirectMemorySize=128m -XX:+ExitOnOutOfMemoryError -Duser.timezone=UTC