Merge pull request #2763 from subutai-io/dev

Dev -> Master
subutai-io · Dec 13, 2018 · 9e006b1 · 9e006b1
2 parents 9c9875f + 8dd1fff
commit 9e006b1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/...ion-impl/src/main/java/io/subutai/core/registration/impl/HostRegistrationManagerImpl.java b/...ion-impl/src/main/java/io/subutai/core/registration/impl/HostRegistrationManagerImpl.java
@@ -16,7 +16,6 @@
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
@@ -198,20 +197,16 @@ public synchronized void queueRequest( final RequestedHost requestedHost ) throw
             if ( requestedHostImpl != null )
             {
                 LOG.info( "Already requested registration" );
-                //todo may be for issue 2749 just remove and readd request? sync with other methods
 
                 //update hostname
+                requestedHostImpl.setHostname( requestedHost.getHostname() );
 
-                if ( !Strings.isNullOrEmpty( requestedHost.getHostname() ) && !requestedHostImpl.getHostname()
-                                                                                                .equalsIgnoreCase(
-                                                                                                        requestedHost
-                                                                                                                .getHostname() ) )
-                {
-                    requestedHostImpl.setHostname( requestedHost.getHostname() );
-                }
-
+                //update containers
                 requestedHostImpl.setHostInfos( requestedHost.getHostInfos() );
 
+                //update ip
+                requestedHostImpl.setAddress( requestedHost.getAddress() );
+
                 requestedHostImpl.refreshDateUpdated();
 
                 requestDataService.update( requestedHostImpl );
@@ -465,8 +460,12 @@ public void onHeartbeat( final ResourceHostInfo resourceHostInfo, final Set<Quot
 
             if ( registrationRequest != null )
             {
+                //update hostname
                 registrationRequest.setHostname( resourceHostInfo.getHostname() );
 
+                //update ip
+                registrationRequest.setAddress( resourceHostInfo.getAddress() );
+
                 requestDataService.update( registrationRequest );
             }
         }

diff --git a/...ration-impl/src/main/java/io/subutai/core/registration/impl/entity/RequestedHostImpl.java b/...ration-impl/src/main/java/io/subutai/core/registration/impl/entity/RequestedHostImpl.java
@@ -172,6 +172,12 @@ public void setHostname( final String hostname )
     }
 
 
+    public void setAddress( final String address )
+    {
+        this.address = address;
+    }
+
+
     @Override
     public HostArchitecture getArch()
     {