diff --git a/appConfig-default.json b/appConfig-default.json index d1ca947..3747911 100644 --- a/appConfig-default.json +++ b/appConfig-default.json @@ -4,9 +4,9 @@ }, "global": { "application.def": ".slider/package/solr/solr-on-yarn.zip", - "java_home": "/Library/Java/JavaVirtualMachines/jdk1.7.0_67.jdk/Contents/Home", - "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/solr-5.2.0-SNAPSHOT", - "site.global.zk_host": "localhost:2181", + "java_home": "/usr/jdk64/jdk1.8.0_40", + "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/solr-5.3.1", + "site.global.zk_host": "${ZK_HOST}", "site.global.solr_host": "${SOLR_HOST}", "site.global.listen_port": "${SOLR.ALLOCATED_PORT}", "site.global.xmx_val": "1g", @@ -19,7 +19,6 @@ }, "components": { "slider-appmaster": { - "jvm.heapsize": "512M" }, "SOLR": { } diff --git a/resources-default.json b/resources-default.json index 6c8febe..a246833 100644 --- a/resources-default.json +++ b/resources-default.json @@ -6,11 +6,12 @@ }, "components": { "slider-appmaster": { + "yarn.memory": "256" }, "SOLR": { "yarn.role.priority": "1", "yarn.component.instances": "2", - "yarn.memory": "1024" + "yarn.memory": "512" } } }