SLIDER-461 Asymmetry in default arguments
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/964e4033 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/964e4033 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/964e4033 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 964e4033d5d0df4c6f15e016417af664f0f8ac31 Parents: bb4e7d3 Author: tedyu <[email protected]> Authored: Fri Sep 26 09:14:48 2014 -0700 Committer: tedyu <[email protected]> Committed: Fri Sep 26 09:14:48 2014 -0700 ---------------------------------------------------------------------- app-packages/hbase-win/appConfig-default.json | 2 +- app-packages/hbase/appConfig-default.json | 2 +- app-packages/storm/appConfig-default.json | 2 +- .../org/apache/slider/providers/agent/AgentProviderService.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/964e4033/app-packages/hbase-win/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/appConfig-default.json b/app-packages/hbase-win/appConfig-default.json index 5b97e69..95e79ab 100644 --- a/app-packages/hbase-win/appConfig-default.json +++ b/app-packages/hbase-win/appConfig-default.json @@ -24,7 +24,7 @@ "site.hbase-site.hbase.tmp.dir": "${AGENT_WORK_ROOT}/work/app/tmp", "site.hbase-site.hbase.local.dir": "${hbase.tmp.dir}/local", "site.hbase-site.hbase.zookeeper.quorum": "${ZK_HOST}", - "site.hbase-site.zookeeper.znode.parent": "${DEF_ZK_PATH}", + "site.hbase-site.zookeeper.znode.parent": "${DEFAULT_ZK_PATH}", "site.hbase-site.hbase.regionserver.info.port": "0", "site.hbase-site.hbase.master.info.port": "${HBASE_MASTER.ALLOCATED_PORT}", "site.hbase-site.hbase.regionserver.port": "0", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/964e4033/app-packages/hbase/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/appConfig-default.json b/app-packages/hbase/appConfig-default.json index 78479db..c7952df 100644 --- a/app-packages/hbase/appConfig-default.json +++ b/app-packages/hbase/appConfig-default.json @@ -33,7 +33,7 @@ "site.hbase-site.hbase.tmp.dir": "${AGENT_WORK_ROOT}/work/app/tmp", "site.hbase-site.hbase.local.dir": "${hbase.tmp.dir}/local", "site.hbase-site.hbase.zookeeper.quorum": "${ZK_HOST}", - "site.hbase-site.zookeeper.znode.parent": "${DEF_ZK_PATH}", + "site.hbase-site.zookeeper.znode.parent": "${DEFAULT_ZK_PATH}", "site.hbase-site.hbase.regionserver.info.port": "0", "site.hbase-site.hbase.master.info.port": "${HBASE_MASTER.ALLOCATED_PORT}", "site.hbase-site.hbase.regionserver.port": "0", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/964e4033/app-packages/storm/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/storm/appConfig-default.json b/app-packages/storm/appConfig-default.json index 683b8cc..2b0eea0 100644 --- a/app-packages/storm/appConfig-default.json +++ b/app-packages/storm/appConfig-default.json @@ -29,7 +29,7 @@ "site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM", "site.storm-site.dev.zookeeper.path": "${AGENT_WORK_ROOT}/app/tmp/dev-storm-zookeeper", "site.storm-site.drpc.invocations.port": "0", - "site.storm-site.storm.zookeeper.root": "${DEF_ZK_PATH}", + "site.storm-site.storm.zookeeper.root": "${DEFAULT_ZK_PATH}", "site.storm-site.transactional.zookeeper.port": "null", "site.storm-site.nimbus.host": "${NIMBUS_HOST}", "site.storm-site.ui.port": "${STORM_UI_SERVER.ALLOCATED_PORT}", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/964e4033/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java index 647c6a8..755b9d8 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java @@ -1427,7 +1427,7 @@ public class AgentProviderService extends AbstractProviderService implements tokens.put("${NN_URI}", nnuri); tokens.put("${NN_HOST}", URI.create(nnuri).getHost()); tokens.put("${ZK_HOST}", appConf.get(OptionKeys.ZOOKEEPER_HOSTS)); - tokens.put("${DEF_ZK_PATH}", appConf.get(OptionKeys.ZOOKEEPER_PATH)); + tokens.put("${DEFAULT_ZK_PATH}", appConf.get(OptionKeys.ZOOKEEPER_PATH)); tokens.put("${DEFAULT_DATA_DIR}", getAmState() .getInternalsSnapshot() .getGlobalOptions()
