Merge pull request #2129 from subutai-io/dev

Dev
subutai-io · Nov 20, 2017 · 6205df1 · 6205df1
2 parents a26f697 + 161aa9a
commit 6205df1
Show file tree

Hide file tree

Showing 7 changed files with 282 additions and 72 deletions.
diff --git a/.../main/java/io/subutai/core/environment/impl/workflow/modification/steps/SetupP2PStep.java b/.../main/java/io/subutai/core/environment/impl/workflow/modification/steps/SetupP2PStep.java
@@ -114,12 +114,6 @@ private void setupP2p( LocalEnvironment environment, Map<String, Set<String>> pe
 
             if ( !CollectionUtil.isCollectionEmpty( rhIds ) )
             {
-                //remove already participating peers
-                for ( RhP2pIp rhP2pIp : environment.getP2pIps().getP2pIps() )
-                {
-                    rhIds.remove( rhP2pIp.getRhId() );
-                }
-
                 //assign p2p IPs to new RHs
                 for ( String rhId : rhIds )
                 {

diff --git a/...anager/hub-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/HubManagerImpl.java b/...anager/hub-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/HubManagerImpl.java
@@ -713,8 +713,26 @@ public void removeListener( HubEventListener listener )
     public void destroy()
     {
         heartbeatExecutorService.shutdown();
+
         peerLogsExecutor.shutdown();
+
         resourceHostMonitorExecutorService.shutdown();
+
+        containersMetricsExecutorService.shutdown();
+
+        asyncHeartbeatExecutor.shutdown();
+
+        peerMetricsExecutorService.shutdown();
+
+        hubLoggerExecutorService.shutdown();
+
+        containerEventExecutor.shutdown();
+
+        environmentTelemetryService.shutdown();
+
+        versionEventExecutor.shutdown();
+
+        tunnelEventService.shutdown();
     }