Skip to content

Commit

Permalink
Remove MaxDirectMemorySize settings
Browse files Browse the repository at this point in the history
  • Loading branch information
xiangfu0 committed Mar 8, 2020
1 parent ce3b46e commit 791fcca
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion kubernetes/helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ following configurable parameters:
| `server.persistence.size` | Size of data volume | `4G` |
| `server.persistence.mountPath` | Mount path of server data volume | `/var/pinot/server/data` |
| `server.persistence.storageClass` | Storage class of backing PVC | `""` |
| `server.jvmOpts` | Pinot Server JVM Options | `-Xms4G -Xmx4G -XX:MaxDirectMemorySize=10g` |
| `server.jvmOpts` | Pinot Server JVM Options | `-Xms4G -Xmx4G` |
| `server.log4j2ConfFile` | Pinot Server log4j2 configuration file | `/opt/pinot/conf/pinot-server-log4j2.xml` |
| `server.pluginsDir` | Pinot Server plugins directory | `/opt/pinot/plugins` |
| `server.service.port` | Service Port | `8098` |
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ server:
storageClass: ""
#storageClass: "ssd"

jvmOpts: "-Xms4G -Xmx4G -XX:MaxDirectMemorySize=10g"
jvmOpts: "-Xms4G -Xmx4G"

log4j2ConfFile: /opt/pinot/conf/pinot-server-log4j2.xml
pluginsDir: /opt/pinot/plugins
Expand Down
3 changes: 0 additions & 3 deletions pinot-integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@
<jvmSettings>
<initialMemorySize>4G</initialMemorySize>
<maxMemorySize>4G</maxMemorySize>
<extraArguments>
<extraArgument>-XX:MaxDirectMemorySize=30g</extraArgument>
</extraArguments>
</jvmSettings>
</program>
</programs>
Expand Down
5 changes: 0 additions & 5 deletions pinot-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@
<initialMemorySize>4G</initialMemorySize>
<maxMemorySize>4G</maxMemorySize>
<extraArguments>
<extraArgument>-XX:MaxDirectMemorySize=30g</extraArgument>
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-admin-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
Expand All @@ -166,7 +165,6 @@
<initialMemorySize>1G</initialMemorySize>
<maxMemorySize>20G</maxMemorySize>
<extraArguments>
<extraArgument>-XX:MaxDirectMemorySize=30g</extraArgument>
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-tools-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
Expand All @@ -178,7 +176,6 @@
<initialMemorySize>10G</initialMemorySize>
<maxMemorySize>30G</maxMemorySize>
<extraArguments>
<extraArgument>-XX:MaxDirectMemorySize=30g</extraArgument>
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-tools-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
Expand All @@ -190,7 +187,6 @@
<initialMemorySize>10G</initialMemorySize>
<maxMemorySize>30G</maxMemorySize>
<extraArguments>
<extraArgument>-XX:MaxDirectMemorySize=30g</extraArgument>
<extraArgument>-Dlog4j2.configurationFile=conf/pinot-tools-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
Expand Down Expand Up @@ -268,7 +264,6 @@
<initialMemorySize>1G</initialMemorySize>
<maxMemorySize>1G</maxMemorySize>
<extraArguments>
<extraArgument>-XX:MaxDirectMemorySize=6g</extraArgument>
<extraArgument>-Dlog4j2.configurationFile=conf/quickstart-log4j2.xml</extraArgument>
</extraArguments>
</jvmSettings>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<log4j.version>2.11.2</log4j.version>

<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>-Xms4g -Xmx4g -XX:MaxPermSize=512m -XX:MaxDirectMemorySize=10g</argLine>
<argLine>-Xms4g -Xmx4g</argLine>

<!-- handle kafka imports
kafka dependency is still explicitly defined in pinot-integration-tests, pinot-tools and pinot-perf pom files.
Expand Down

0 comments on commit 791fcca

Please sign in to comment.