You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by et...@apache.org on 2020/02/12 22:53:27 UTC
[storm] branch 2.1.x-branch updated: [STORM-3580] Processs -c
option to storm.py for Rebalance (#3207)
This is an automated email from the ASF dual-hosted git repository.
ethanli pushed a commit to branch 2.1.x-branch
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/2.1.x-branch by this push:
new 5306fe8 [STORM-3580] Processs -c option to storm.py for Rebalance (#3207)
5306fe8 is described below
commit 5306fe83e42e50bed668050cb82aed30391f32ef
Author: Bipin Prasad <bi...@yahoo.com>
AuthorDate: Wed Feb 12 16:38:44 2020 -0600
[STORM-3580] Processs -c option to storm.py for Rebalance (#3207)
---
storm-core/src/jvm/org/apache/storm/command/Rebalance.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/storm-core/src/jvm/org/apache/storm/command/Rebalance.java b/storm-core/src/jvm/org/apache/storm/command/Rebalance.java
index 92dcc7b..ffaefda 100644
--- a/storm-core/src/jvm/org/apache/storm/command/Rebalance.java
+++ b/storm-core/src/jvm/org/apache/storm/command/Rebalance.java
@@ -20,6 +20,7 @@ import org.apache.storm.generated.Nimbus;
import org.apache.storm.generated.RebalanceOptions;
import org.apache.storm.utils.NimbusClient;
import org.apache.storm.utils.Utils;
+import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,6 +58,15 @@ public class Rebalance {
}
Map<String, Object> confOverrides = (Map<String, Object>) cl.get("t");
+ Map<String, Object> jvmOpts = Utils.readCommandLineOpts(); // values in -Dstorm.options (originally -c in storm.py)
+ if (jvmOpts != null && !jvmOpts.isEmpty()) {
+ if (confOverrides == null) {
+ confOverrides = jvmOpts;
+ } else {
+ confOverrides.putAll(jvmOpts); // override with values obtained from -Dstorm.options
+ }
+ LOG.info("Rebalancing topology with overrides {}", JSONObject.toJSONString(confOverrides));
+ }
if (null != confOverrides) {
rebalanceOptions.set_topology_conf_overrides(JSONValue.toJSONString(confOverrides));