#1128

Removed obsolete hub processors to decreae number of requests to Hub and number of service threads on SS side Removed obsolete DaoHelper and moved it functionality to ConfigDataService class
subutai-io · Sep 18, 2017 · a967505 · a967505
1 parent cb50579
commit a967505
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 357 deletions.
diff --git a/...r/hub-manager-api/src/main/java/io/subutai/core/hubmanager/api/dao/ConfigDataService.java b/...r/hub-manager-api/src/main/java/io/subutai/core/hubmanager/api/dao/ConfigDataService.java
@@ -11,4 +11,8 @@ public interface ConfigDataService
     Config getHubConfig( String peerId );
 
     void deleteConfig( final String peerId );
+
+    String getPeerOwnerId( String peerId );
+
+    boolean isPeerRegisteredToHub( String peerId );
 }
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
@@ -51,30 +51,27 @@
 import io.subutai.core.hubmanager.impl.appscale.AppScaleProcessor;
 import io.subutai.core.hubmanager.impl.dao.ConfigDataServiceImpl;
 import io.subutai.core.hubmanager.impl.dao.ContainerMetricsServiceImpl;
-import io.subutai.core.hubmanager.impl.processor.HubEnvironmentProcessor;
 import io.subutai.core.hubmanager.impl.environment.state.Context;
 import io.subutai.core.hubmanager.impl.http.HubRestClient;
+import io.subutai.core.hubmanager.impl.processor.HeartbeatProcessor;
+import io.subutai.core.hubmanager.impl.processor.HubEnvironmentProcessor;
+import io.subutai.core.hubmanager.impl.processor.ProductProcessor;
+import io.subutai.core.hubmanager.impl.processor.ProxyProcessor;
+import io.subutai.core.hubmanager.impl.processor.UserTokenProcessor;
+import io.subutai.core.hubmanager.impl.processor.port_map.ContainerPortMapProcessor;
 import io.subutai.core.hubmanager.impl.requestor.ContainerEventProcessor;
 import io.subutai.core.hubmanager.impl.requestor.ContainerMetricsProcessor;
-import io.subutai.core.hubmanager.impl.util.EnvironmentUserHelper;
-import io.subutai.core.hubmanager.impl.processor.HeartbeatProcessor;
 import io.subutai.core.hubmanager.impl.requestor.HubLoggerProcessor;
 import io.subutai.core.hubmanager.impl.requestor.PeerMetricsProcessor;
-import io.subutai.core.hubmanager.impl.processor.ProductProcessor;
-import io.subutai.core.hubmanager.impl.processor.ProxyProcessor;
 import io.subutai.core.hubmanager.impl.requestor.ResourceHostDataProcessor;
-import io.subutai.core.hubmanager.impl.processor.ResourceHostRegisterProcessor;
-import io.subutai.core.hubmanager.impl.processor.SystemConfProcessor;
-import io.subutai.core.hubmanager.impl.processor.UserTokenProcessor;
 import io.subutai.core.hubmanager.impl.requestor.VersionInfoProcessor;
-import io.subutai.core.hubmanager.impl.processor.port_map.ContainerPortMapProcessor;
 import io.subutai.core.hubmanager.impl.tunnel.TunnelEventProcessor;
 import io.subutai.core.hubmanager.impl.tunnel.TunnelProcessor;
+import io.subutai.core.hubmanager.impl.util.EnvironmentUserHelper;
 import io.subutai.core.identity.api.IdentityManager;
 import io.subutai.core.identity.api.model.User;
 import io.subutai.core.metric.api.Monitor;
 import io.subutai.core.peer.api.PeerManager;
-import io.subutai.core.registration.api.HostRegistrationManager;
 import io.subutai.core.security.api.SecurityManager;
 import io.subutai.hub.share.common.HubEventListener;
 import io.subutai.hub.share.dto.PeerDto;
@@ -137,8 +134,6 @@ public class HubManagerImpl implements HubManager, HostListener
 
     private IdentityManager identityManager;
 
-    private HostRegistrationManager hostRegistrationManager;
-
     private HeartbeatProcessor heartbeatProcessor;
 
     private ResourceHostDataProcessor resourceHostDataProcessor;
@@ -266,19 +261,13 @@ private void initHeartbeatProcessors()
 
         StateLinkProcessor hubEnvironmentProcessor = new HubEnvironmentProcessor( ctx );
 
-        StateLinkProcessor systemConfProcessor = new SystemConfProcessor( restClient );
-
         ProductProcessor productProcessor = new ProductProcessor( configManager, this.hubEventListeners, restClient );
 
         AppScaleProcessor appScaleProcessor = new AppScaleProcessor( new AppScaleManager( peerManager ), restClient );
 
         EnvironmentTelemetryProcessor environmentTelemetryProcessor =
                 new EnvironmentTelemetryProcessor( this, peerManager, configManager, restClient );
 
-        StateLinkProcessor resourceHostRegisterProcessor =
-                new ResourceHostRegisterProcessor( hostRegistrationManager, peerManager, restClient );
-
-
         ContainerPortMapProcessor containerPortMapProcessor = new ContainerPortMapProcessor( ctx );
 
         ProxyProcessor proxyProcessor = new ProxyProcessor( peerManager, restClient );
@@ -290,11 +279,8 @@ private void initHeartbeatProcessors()
                                                                              .addProcessor( tunnelProcessor )
                                                                              .addProcessor(
                                                                                      environmentTelemetryProcessor )
-                                                                             .addProcessor( systemConfProcessor )
                                                                              .addProcessor( productProcessor )
                                                                              .addProcessor( appScaleProcessor )
-                                                                             .addProcessor(
-                                                                                     resourceHostRegisterProcessor )
                                                                              .addProcessor( proxyProcessor )
                                                                              .addProcessor( containerPortMapProcessor )
                                                                              .addProcessor( userTokenProcessor );
@@ -798,12 +784,6 @@ public void setIdentityManager( final IdentityManager identityManager )
     }
 
 
-    public void setHostRegistrationManager( final HostRegistrationManager hostRegistrationManager )
-    {
-        this.hostRegistrationManager = hostRegistrationManager;
-    }
-
-
     @Override
     public void onContainerStateChanged( final ContainerHostInfo containerInfo, final ContainerHostState previousState,
                                          final ContainerHostState currentState )

diff --git a/...ger/hub-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/adapter/DaoHelper.java b/...ger/hub-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/adapter/DaoHelper.java
diff --git a/...ub-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/adapter/HubAdapterImpl.java b/...ub-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/adapter/HubAdapterImpl.java
@@ -32,7 +32,9 @@
 import io.subutai.core.hubmanager.api.HubManager;
 import io.subutai.core.hubmanager.api.RestClient;
 import io.subutai.core.hubmanager.api.RestResult;
+import io.subutai.core.hubmanager.api.dao.ConfigDataService;
 import io.subutai.core.hubmanager.api.exception.HubManagerException;
+import io.subutai.core.hubmanager.impl.dao.ConfigDataServiceImpl;
 import io.subutai.core.identity.api.IdentityManager;
 import io.subutai.core.identity.api.model.User;
 import io.subutai.core.peer.api.PeerManager;
@@ -42,7 +44,6 @@
 import static java.lang.String.format;
 
 
-//TODO use ConfigDataServiceimpl instead of DaoHelper
 public class HubAdapterImpl implements HubAdapter, EnvironmentEventListener, HostListener
 {
     private static final String USER_ENVIRONMENTS_URL = "/rest/v1/adapter/users/%s/environments";
@@ -65,7 +66,7 @@ public class HubAdapterImpl implements HubAdapter, EnvironmentEventListener, Hos
 
     private final Gson gson = new GsonBuilder().serializeNulls().setPrettyPrinting().disableHtmlEscaping().create();
 
-    private final DaoHelper daoHelper;
+    private final ConfigDataService configDataService;
 
 
     private final IdentityManager identityManager;
@@ -78,7 +79,7 @@ public class HubAdapterImpl implements HubAdapter, EnvironmentEventListener, Hos
     public HubAdapterImpl( DaoManager daoManager, PeerManager peerManager, IdentityManager identityManager )
             throws HubManagerException
     {
-        daoHelper = new DaoHelper( daoManager );
+        configDataService = new ConfigDataServiceImpl( daoManager );
 
         this.identityManager = identityManager;
 
@@ -96,13 +97,13 @@ private RestClient getRestClient()
 
     private boolean isRegistered()
     {
-        return daoHelper.isPeerRegisteredToHub( peerId );
+        return configDataService.isPeerRegisteredToHub( peerId );
     }
 
 
     private String getOwnerId()
     {
-        return daoHelper.getPeerOwnerId( peerId );
+        return configDataService.getPeerOwnerId( peerId );
     }
 
 

diff --git a/...-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/appscale/AppScaleManager.java b/...-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/appscale/AppScaleManager.java
@@ -53,7 +53,7 @@ void installCluster( AppScaleConfigDto config ) throws CommandException
 
         installAppScale( controllerHost, config );
 
-        setupRevproxy( controllerHost, config );
+        setupRevproxy( config );
 
         log.debug( "AppScale installation done" );
     }
@@ -98,18 +98,18 @@ else if ( StringUtils.startsWith( s, "password:" ) )
 
     private String formatIps( Map<String, String> ipList, List<String> hosts )
     {
-        String s = "";
+        StringBuilder s = new StringBuilder();
 
         for ( String hostname : hosts )
         {
-            s += ipList.get( hostname ) + " ";
+            s.append( ipList.get( hostname ) ).append( " " );
         }
 
-        return s.replace( "/24", "" );
+        return s.toString().replace( "/24", "" );
     }
 
 
-    private void setupRevproxy( ContainerHost containerHost, AppScaleConfigDto config )
+    private void setupRevproxy( AppScaleConfigDto config )
     {
         String ipAddress = config.getContainerAddresses().get( config.getClusterName() ).replace( "/24", "" );
 
@@ -213,6 +213,6 @@ private Long getVni( final AppScaleConfigDto config )
             log.error( e.getMessage() );
         }
 
-        return 0l;
+        return 0L;
     }
 }
diff --git a/...manager-impl/src/main/java/io/subutai/core/hubmanager/impl/dao/ConfigDataServiceImpl.java b/...manager-impl/src/main/java/io/subutai/core/hubmanager/impl/dao/ConfigDataServiceImpl.java
@@ -2,6 +2,7 @@
 
 
 import javax.persistence.EntityManager;
+import javax.persistence.Query;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,6 +25,45 @@ public ConfigDataServiceImpl( final DaoManager daoManager )
     }
 
 
+    public String getPeerOwnerId( String peerId )
+    {
+        return executeQuery( " select user_id from h_config where peer_id = ? ", peerId );
+    }
+
+
+    public boolean isPeerRegisteredToHub( String peerId )
+    {
+        Integer count = executeQuery( " select count(*) from h_config where peer_id = ? ", peerId );
+
+        return count != null && count > 0;
+    }
+
+
+    private <T> T executeQuery( String sql, String peerId )
+    {
+        EntityManager em = daoManager.getEntityManagerFactory().createEntityManager();
+
+        try
+        {
+            Query q = em.createNativeQuery( sql );
+
+            q.setParameter( 1, peerId );
+
+            return ( T ) q.getSingleResult();
+        }
+        catch ( Exception e )
+        {
+            LOG.error( "Error to execute query: ", e );
+        }
+        finally
+        {
+            daoManager.closeEntityManager( em );
+        }
+
+        return null;
+    }
+
+
     @Override
     public void saveHubConfig( final Config config )
     {
@@ -55,8 +95,7 @@ public ConfigEntity getHubConfig( String peerId )
 
         try
         {
-            ConfigEntity configuration = em.find( ConfigEntity.class, peerId );
-            return configuration;
+            return em.find( ConfigEntity.class, peerId );
         }
         catch ( Exception ex )
         {

diff --git a/...b-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/dao/ContainerMetricsDAO.java b/...b-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/dao/ContainerMetricsDAO.java
@@ -122,7 +122,7 @@ void remove( final Long id )
     }
 
 
-    public void purgeOldMetrics( int daysOld )
+    void purgeOldMetrics( int daysOld )
     {
         EntityManager em = daoManager.getEntityManagerFromFactory();
         try

diff --git a/...er/hub-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/model/ConfigEntity.java b/...er/hub-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/model/ConfigEntity.java
@@ -75,34 +75,16 @@ public String getHubIp()
     }
 
 
-    public void setHubIp( String serverIp )
-    {
-        this.serverIp = serverIp;
-    }
-
-
     @Override
     public String getOwnerId()
     {
         return ownerId;
     }
 
 
-    public void setOwnerId( String ownerId )
-    {
-        this.ownerId = ownerId;
-    }
-
-
     @Override
     public String getOwnerEmail()
     {
         return ownerEmail;
     }
-
-
-    public void setOwnerEmail( String ownerEmail )
-    {
-        this.ownerEmail = ownerEmail;
-    }
 }