浏览代码

Disable calling mlockall by default, can be enabled by setting bootstrap.mlockall to `true`, closes #567.

kimchy 15 年之前
父节点
当前提交
96a2950ab5
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java

+ 1 - 1
modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java

@@ -60,7 +60,7 @@ public class Bootstrap {
 
     private void setup(boolean addShutdownHook, Tuple<Settings, Environment> tuple) throws Exception {
 //        Loggers.getLogger(Bootstrap.class, tuple.v1().get("name")).info("heap_size {}/{}", JvmStats.jvmStats().mem().heapCommitted(), JvmInfo.jvmInfo().mem().heapMax());
-        if (tuple.v1().getAsBoolean("bootstrap.mlockall", true)) {
+        if (tuple.v1().getAsBoolean("bootstrap.mlockall", false)) {
             Natives.tryMlockall();
         }
         tuple = setupJmx(tuple);