Last active
October 30, 2017 01:43
-
-
Save erikdw/3d9eea7eb2028e22da5b17ded20e0899 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git storm-core/src/jvm/org/apache/storm/daemon/supervisor/ReadClusterState.java storm-core/src/jvm/org/apache/storm/daemon/supervisor/ReadClusterState.java | |
index 0fa60f129..dd4e8db78 100644 | |
--- storm-core/src/jvm/org/apache/storm/daemon/supervisor/ReadClusterState.java | |
+++ storm-core/src/jvm/org/apache/storm/daemon/supervisor/ReadClusterState.java | |
@@ -145,6 +145,7 @@ public class ReadClusterState implements Runnable, AutoCloseable { | |
} | |
} | |
HashSet<Integer> allPorts = new HashSet<>(assignedPorts); | |
+ iSuper.assigned(allPorts); | |
allPorts.addAll(slots.keySet()); | |
Map<Integer, Set<TopoProfileAction>> filtered = new HashMap<>(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java | |
index a6adace80..d99726c42 100644 | |
--- storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java | |
+++ storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java | |
@@ -233,7 +233,7 @@ public class Supervisor implements DaemonCommon, AutoCloseable { | |
/** | |
* start distribute supervisor | |
*/ | |
- private void launchDaemon() { | |
+ public void launchDaemon() { | |
LOG.info("Starting supervisor for storm version '{}'.", VersionInfo.getVersion()); | |
try { | |
Map<String, Object> conf = getConf(); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment