Repository: storm Updated Branches: refs/heads/master 14b0b4fc5 -> fbeafdcbb
STORM-3075 fix NPE Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/917be55a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/917be55a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/917be55a Branch: refs/heads/master Commit: 917be55a5bd6be8baa4811c6684897da949c3bb1 Parents: 14b0b4f Author: Aaron Gresch <agre...@yahoo-inc.com> Authored: Tue May 15 15:06:53 2018 -0500 Committer: Aaron Gresch <agre...@yahoo-inc.com> Committed: Thu May 17 10:24:59 2018 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/917be55a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java ---------------------------------------------------------------------- diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java index a004c47..48e8c21 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java @@ -487,14 +487,16 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon { blobStore = ServerUtils.getNimbusBlobStore(conf, this.nimbusHostPortInfo, null); } this.blobStore = blobStore; + + if (topoCache == null) { + topoCache = new TopoCache(blobStore, conf); + } if (leaderElector == null) { leaderElector = Zookeeper.zkLeaderElector(conf, zkClient, blobStore, topoCache, stormClusterState, getNimbusAcls(conf)); } this.leaderElector = leaderElector; this.blobStore.setLeaderElector(this.leaderElector); - if (topoCache == null) { - topoCache = new TopoCache(blobStore, conf); - } + this.topoCache = topoCache; this.assignmentsDistributer = AssignmentDistributionService.getInstance(conf); this.idToSchedStatus = new AtomicReference<>(new HashMap<>()); @@ -2136,7 +2138,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon { LOG.info("Fragmentation after scheduling is: {} MB, {} PCore CPUs", fragmentedMemory(), fragmentedCpu()); nodeIdToResources.get().forEach((id, node) -> LOG.info( - "Node Id: {} Total Mem: {}, Used Mem: {}, Avialble Mem: {}, Total CPU: {}, Used " + + "Node Id: {} Total Mem: {}, Used Mem: {}, Available Mem: {}, Total CPU: {}, Used " + "CPU: {}, Available CPU: {}, fragmented: {}", id, node.getTotalMem(), node.getUsedMem(), node.getAvailableMem(), node.getTotalCpu(), node.getUsedCpu(), node.getAvailableCpu(), isFragmented(node)));