You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/12/21 15:46:44 UTC
[16/23] storm git commit: edits based on comments
edits based on comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7676e0d9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7676e0d9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7676e0d9
Branch: refs/heads/master
Commit: 7676e0d9cfa9efedc0fcb538bc27b28ea9d8b076
Parents: a7f6913
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Wed Dec 16 10:39:25 2015 -0600
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Wed Dec 16 10:39:25 2015 -0600
----------------------------------------------------------------------
.../jvm/backtype/storm/scheduler/SupervisorDetails.java | 4 ++--
.../src/jvm/backtype/storm/scheduler/TopologyDetails.java | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7676e0d9/storm-core/src/jvm/backtype/storm/scheduler/SupervisorDetails.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/scheduler/SupervisorDetails.java b/storm-core/src/jvm/backtype/storm/scheduler/SupervisorDetails.java
index afdabe8..5943ecf 100644
--- a/storm-core/src/jvm/backtype/storm/scheduler/SupervisorDetails.java
+++ b/storm-core/src/jvm/backtype/storm/scheduler/SupervisorDetails.java
@@ -121,7 +121,7 @@ public class SupervisorDetails {
public Double getTotalMemory() {
Double totalMemory = getTotalResource(Config.SUPERVISOR_MEMORY_CAPACITY_MB);
if (totalMemory == null) {
- throw new IllegalStateException("default value for supervisor.memory.capacity.mb is not set!");
+ throw new IllegalStateException("default value for " + Config.SUPERVISOR_MEMORY_CAPACITY_MB + " is not set!");
}
return totalMemory;
}
@@ -129,7 +129,7 @@ public class SupervisorDetails {
public Double getTotalCPU() {
Double totalCPU = getTotalResource(Config.SUPERVISOR_CPU_CAPACITY);
if (totalCPU == null) {
- throw new IllegalStateException("default value for supervisor.cpu.capacity is not set!");
+ throw new IllegalStateException("default value for " + Config.SUPERVISOR_CPU_CAPACITY + " is not set!");
}
return totalCPU;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/7676e0d9/storm-core/src/jvm/backtype/storm/scheduler/TopologyDetails.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/scheduler/TopologyDetails.java b/storm-core/src/jvm/backtype/storm/scheduler/TopologyDetails.java
index 9e35981..357bec7 100644
--- a/storm-core/src/jvm/backtype/storm/scheduler/TopologyDetails.java
+++ b/storm-core/src/jvm/backtype/storm/scheduler/TopologyDetails.java
@@ -419,15 +419,15 @@ public class TopologyDetails {
public void addDefaultResforExec(ExecutorDetails exec) {
Double topologyComponentCpuPcorePercent = Utils.getDouble(this.topologyConf.get(Config.TOPOLOGY_COMPONENT_CPU_PCORE_PERCENT), null);
if (topologyComponentCpuPcorePercent == null) {
- LOG.warn("default value for topology.component.cpu.pcore.percent needs to be set!");
+ LOG.warn("default value for " + Config.TOPOLOGY_COMPONENT_CPU_PCORE_PERCENT + " needs to be set!");
}
Double topologyComponentResourcesOffheapMemoryMb = Utils.getDouble(this.topologyConf.get(Config.TOPOLOGY_COMPONENT_RESOURCES_OFFHEAP_MEMORY_MB), null);
if (topologyComponentResourcesOffheapMemoryMb == null) {
- LOG.warn("default value for topology.component.resources.offheap.memory.mb needs to be set!");
+ LOG.warn("default value for " + Config.TOPOLOGY_COMPONENT_RESOURCES_OFFHEAP_MEMORY_MB + " needs to be set!");
}
Double topologyComponentResourcesOnheapMemoryMb = Utils.getDouble(this.topologyConf.get(Config.TOPOLOGY_COMPONENT_RESOURCES_ONHEAP_MEMORY_MB), null);
if (topologyComponentResourcesOnheapMemoryMb == null) {
- LOG.warn("default value for topology.component.resources.onheap.memory.mb needs to be set!");
+ LOG.warn("default value for " + Config.TOPOLOGY_COMPONENT_RESOURCES_ONHEAP_MEMORY_MB + " needs to be set!");
}
Map<String, Double> defaultResourceList = new HashMap<>();
@@ -448,11 +448,11 @@ public class TopologyDetails {
private void initConfigs() {
this.topologyWorkerMaxHeapSize = Utils.getDouble(this.topologyConf.get(Config.TOPOLOGY_WORKER_MAX_HEAP_SIZE_MB), null);
if (this.topologyWorkerMaxHeapSize == null) {
- LOG.warn("default value for topology.worker.max.heap.size.mb needs to be set!");
+ LOG.warn("default value for " + Config.TOPOLOGY_WORKER_MAX_HEAP_SIZE_MB + " needs to be set!");
}
this.topologyPriority = Utils.getInt(this.topologyConf.get(Config.TOPOLOGY_PRIORITY), null);
if (this.topologyPriority == null) {
- LOG.warn("default value for topology.priority needs to be set!");
+ LOG.warn("default value for " + Config.TOPOLOGY_PRIORITY + " needs to be set!");
}
}