You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/11/20 23:26:36 UTC
[11/15] storm git commit: Move pass List to String away from Utils
Move pass List to String away from Utils
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ca21dc7d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ca21dc7d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ca21dc7d
Branch: refs/heads/master
Commit: ca21dc7d615e1dae1cd4c0f692c3b5f561688347
Parents: 2e56ede
Author: zhuol <zh...@yahoo-inc.com>
Authored: Fri Nov 20 15:20:12 2015 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Fri Nov 20 15:20:12 2015 -0600
----------------------------------------------------------------------
.../jvm/backtype/storm/scheduler/Cluster.java | 31 ++++++++++++++++++--
.../src/jvm/backtype/storm/utils/Utils.java | 7 -----
2 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ca21dc7d/storm-core/src/jvm/backtype/storm/scheduler/Cluster.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/scheduler/Cluster.java b/storm-core/src/jvm/backtype/storm/scheduler/Cluster.java
index a8ff2ab..f4410ad 100644
--- a/storm-core/src/jvm/backtype/storm/scheduler/Cluster.java
+++ b/storm-core/src/jvm/backtype/storm/scheduler/Cluster.java
@@ -466,15 +466,35 @@ public class Cluster {
return networkTopography;
}
+ private String getStringFromStringList(Object o) {
+ StringBuilder sb = new StringBuilder();
+ for (String s : (List<String>) o) {
+ sb.append(s);
+ sb.append(" ");
+ }
+ return sb.toString();
+ }
+
/*
* Get heap memory usage for a worker's main process and logwriter process
* */
private Double getAssignedMemoryForSlot(Map topConf) {
Double totalWorkerMemory = 0.0;
- String topologyWorkerChildopts = Utils.getString(topConf.get(Config.TOPOLOGY_WORKER_CHILDOPTS), null);
- String workerChildopts = Utils.getString(topConf.get(Config.WORKER_CHILDOPTS), null);
+ String topologyWorkerChildopts = null;
+ if (topConf.get(Config.TOPOLOGY_WORKER_CHILDOPTS) instanceof List) {
+ topologyWorkerChildopts = getStringFromStringList(topConf.get(Config.TOPOLOGY_WORKER_CHILDOPTS));
+ } else {
+ topologyWorkerChildopts = Utils.getString(topConf.get(Config.TOPOLOGY_WORKER_CHILDOPTS), null);
+ }
Double memTopologyWorkerChildopts = Utils.parseJvmHeapMemByChildOpts(topologyWorkerChildopts, null);
+
+ String workerChildopts = null;
+ if (topConf.get(Config.WORKER_CHILDOPTS) instanceof List) {
+ workerChildopts = getStringFromStringList(topConf.get(Config.WORKER_CHILDOPTS));
+ } else {
+ workerChildopts = Utils.getString(topConf.get(Config.WORKER_CHILDOPTS), null);
+ }
Double memWorkerChildopts = Utils.parseJvmHeapMemByChildOpts(workerChildopts, null);
if (memTopologyWorkerChildopts != null) {
@@ -485,7 +505,12 @@ public class Cluster {
totalWorkerMemory += Utils.getInt(topConf.get(Config.WORKER_HEAP_MEMORY_MB));
}
- String topoWorkerLwChildopts = Utils.getString(topConf.get(Config.TOPOLOGY_WORKER_LOGWRITER_CHILDOPTS), null);
+ String topoWorkerLwChildopts = null;
+ if (topConf.get(Config.TOPOLOGY_WORKER_LOGWRITER_CHILDOPTS) instanceof List) {
+ topoWorkerLwChildopts = getStringFromStringList(topConf.get(Config.TOPOLOGY_WORKER_LOGWRITER_CHILDOPTS);
+ } else {
+ topoWorkerLwChildopts = Utils.getString(topConf.get(Config.TOPOLOGY_WORKER_LOGWRITER_CHILDOPTS), null);
+ }
if (topoWorkerLwChildopts != null) {
totalWorkerMemory += Utils.parseJvmHeapMemByChildOpts(topoWorkerLwChildopts, 0.0);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ca21dc7d/storm-core/src/jvm/backtype/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/Utils.java b/storm-core/src/jvm/backtype/storm/utils/Utils.java
index 766b10f..b9a89f7 100644
--- a/storm-core/src/jvm/backtype/storm/utils/Utils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java
@@ -511,13 +511,6 @@ public class Utils {
}
if (o instanceof String) {
return (String) o;
- } else if (o instanceof List) {
- StringBuilder sb = new StringBuilder();
- for (String s : (List<String>) o) {
- sb.append(s);
- sb.append(" ");
- }
- return sb.toString();
} else {
throw new IllegalArgumentException("Don't know how to convert " + o + " + to String");
}