Fix the command line for heron executor for aurora. (#2525)
diff --git a/heron/config/src/yaml/conf/aurora/heron.aurora b/heron/config/src/yaml/conf/aurora/heron.aurora
index 2136c2f..8ab3df4 100644
--- a/heron/config/src/yaml/conf/aurora/heron.aurora
+++ b/heron/config/src/yaml/conf/aurora/heron.aurora
@@ -22,48 +22,48 @@
command_to_start_executor = \
'{{EXECUTOR_BINARY}}' \
- '--shard={{mesos.instance}}' \
- '--topology-name={{TOPOLOGY_NAME}}' \
- '--topology-id={{TOPOLOGY_ID}}' \
- '--topology-defn-file={{TOPOLOGY_DEFINITION_FILE}}' \
- '--state-manager-connection={{STATEMGR_CONNECTION_STRING}}' \
- '--state-manager-root={{STATEMGR_ROOT_PATH}}' \
- '--tmaster-binary={{TMASTER_BINARY}}' \
- '--stmgr-binary={{STMGR_BINARY}}' \
- '--metrics-manager-classpath="{{METRICSMGR_CLASSPATH}}"' \
- '--instance-jvm-opts={{INSTANCE_JVM_OPTS_IN_BASE64}}' \
- '--classpath="{{TOPOLOGY_CLASSPATH}}"' \
- '--master-port={{thermos.ports[port1]}}' \
- '--tmaster-controller-port={{thermos.ports[port2]}}' \
- '--tmaster-stats-port={{thermos.ports[port3]}}' \
- '--heron-internals-config-file={{SYSTEM_YAML}}' \
- '--override-config-file={{OVERRIDE_YAML}} ' \
- '--component-ram-map={{COMPONENT_RAMMAP}}' \
- '--component-jvm-opts={{COMPONENT_JVM_OPTS_IN_BASE64}}' \
- '--pkg-type={{TOPOLOGY_PACKAGE_TYPE}}' \
- '--topology-binary-file={{TOPOLOGY_BINARY_FILE}}' \
- '--heron-java-home={{JAVA_HOME}}' \
- '--shell-port={{thermos.ports[http]}}' \
- '--heron-shell-binary={{SHELL_BINARY}}' \
- '--metrics-manager-port={{thermos.ports[port4]}}' \
- '--cluster={{CLUSTER}}' \
- '--role={{ROLE}}' \
- '--environment={{ENVIRON}}' \
- '--instance-classpath="{{INSTANCE_CLASSPATH}}"' \
- '--metrics-sinks-config-file={{METRICS_YAML}}' \
- '--scheduler-classpath="{{SCHEDULER_CLASSPATH}}"' \
- '--scheduler-port="{{thermos.ports[scheduler]}}"' \
- '--python-instance-binary={{PYTHON_INSTANCE_BINARY}}' \
- '--cpp-instance-binary={{CPP_INSTANCE_BINARY}}' \
- '--metricscache-manager-classpath={{METRICSCACHEMGR_CLASSPATH}}' \
- '--metricscache-manager-master-port={{thermos.ports[metricscachemgr_masterport]}}' \
- '--metricscache-manager-stats-port={{thermos.ports[metricscachemgr_statsport]}}' \
- '--is-stateful={{IS_STATEFUL_ENABLED}}' \
- '--checkpoint-manager-classpath="{{CKPTMGR_CLASSPATH}}"' \
- '--checkpoint-manager-port={{thermos.ports[ckptmgr_port]}}' \
- '--stateful-config-file={{STATEFUL_CONFIG_YAML}}' \
- '--health-manager-mode={{HEALTHMGR_MODE}}' \
- '--health-manager-classpath={{HEALTHMGR_CLASSPATH}}'
+ ' --shard={{mesos.instance}}' \
+ ' --topology-name={{TOPOLOGY_NAME}}' \
+ ' --topology-id={{TOPOLOGY_ID}}' \
+ ' --topology-defn-file={{TOPOLOGY_DEFINITION_FILE}}' \
+ ' --state-manager-connection={{STATEMGR_CONNECTION_STRING}}' \
+ ' --state-manager-root={{STATEMGR_ROOT_PATH}}' \
+ ' --tmaster-binary={{TMASTER_BINARY}}' \
+ ' --stmgr-binary={{STMGR_BINARY}}' \
+ ' --metrics-manager-classpath="{{METRICSMGR_CLASSPATH}}"' \
+ ' --instance-jvm-opts={{INSTANCE_JVM_OPTS_IN_BASE64}}' \
+ ' --classpath="{{TOPOLOGY_CLASSPATH}}"' \
+ ' --master-port={{thermos.ports[port1]}}' \
+ ' --tmaster-controller-port={{thermos.ports[port2]}}' \
+ ' --tmaster-stats-port={{thermos.ports[port3]}}' \
+ ' --heron-internals-config-file={{SYSTEM_YAML}}' \
+ ' --override-config-file={{OVERRIDE_YAML}} ' \
+ ' --component-ram-map={{COMPONENT_RAMMAP}}' \
+ ' --component-jvm-opts={{COMPONENT_JVM_OPTS_IN_BASE64}}' \
+ ' --pkg-type={{TOPOLOGY_PACKAGE_TYPE}}' \
+ ' --topology-binary-file={{TOPOLOGY_BINARY_FILE}}' \
+ ' --heron-java-home={{JAVA_HOME}}' \
+ ' --shell-port={{thermos.ports[http]}}' \
+ ' --heron-shell-binary={{SHELL_BINARY}}' \
+ ' --metrics-manager-port={{thermos.ports[port4]}}' \
+ ' --cluster={{CLUSTER}}' \
+ ' --role={{ROLE}}' \
+ ' --environment={{ENVIRON}}' \
+ ' --instance-classpath="{{INSTANCE_CLASSPATH}}"' \
+ ' --metrics-sinks-config-file={{METRICS_YAML}}' \
+ ' --scheduler-classpath="{{SCHEDULER_CLASSPATH}}"' \
+ ' --scheduler-port="{{thermos.ports[scheduler]}}"' \
+ ' --python-instance-binary={{PYTHON_INSTANCE_BINARY}}' \
+ ' --cpp-instance-binary={{CPP_INSTANCE_BINARY}}' \
+ ' --metricscache-manager-classpath={{METRICSCACHEMGR_CLASSPATH}}' \
+ ' --metricscache-manager-master-port={{thermos.ports[metricscachemgr_masterport]}}' \
+ ' --metricscache-manager-stats-port={{thermos.ports[metricscachemgr_statsport]}}' \
+ ' --is-stateful={{IS_STATEFUL_ENABLED}}' \
+ ' --checkpoint-manager-classpath="{{CKPTMGR_CLASSPATH}}"' \
+ ' --checkpoint-manager-port={{thermos.ports[ckptmgr_port]}}' \
+ ' --stateful-config-file={{STATEFUL_CONFIG_YAML}}' \
+ ' --health-manager-mode={{HEALTHMGR_MODE}}' \
+ ' --health-manager-classpath={{HEALTHMGR_CLASSPATH}}'
launch_heron_executor = Process(
name = 'launch_heron_executor',
