From a21dcf6c16f794e1ac1287b9fcd3b4e8a9418824 Mon Sep 17 00:00:00 2001
From: Erik Weathers <erikdw@gmail.com>
Date: Tue, 19 Dec 2017 14:04:09 -0700
Subject: [PATCH] [STORM-2690] resurrect invocation of ISupervisor.assigned() &
 make Supervisor.launchDaemon() accessible

This commit fixes the storm-mesos integration for the interaction between the Storm core's Supervisor daemon
and the MesosSupervisor that implements the ISupervisor interface.
---
 .../org/apache/storm/daemon/supervisor/ReadClusterState.java    | 1 +
 .../src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/ReadClusterState.java b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/ReadClusterState.java
index 55bd935d911..50fd7ac35ed 100644
--- a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/ReadClusterState.java
+++ b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/ReadClusterState.java
@@ -145,6 +145,7 @@ public synchronized void run() {
                 }
             }
             HashSet<Integer> allPorts = new HashSet<>(assignedPorts);
+            iSuper.assigned(allPorts);
             allPorts.addAll(slots.keySet());
             
             Map<Integer, Set<TopoProfileAction>> filtered = new HashMap<>();
diff --git a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java
index 386beb509b4..c305a72038e 100644
--- a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java
+++ b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Supervisor.java
@@ -245,7 +245,7 @@ public void launch() throws Exception {
     /**
      * start distribute supervisor
      */
-    private void launchDaemon() {
+    public void launchDaemon() {
         LOG.info("Starting supervisor for storm version '{}'.", VersionInfo.getVersion());
         try {
             Map<String, Object> conf = getConf();