update to EIPManager to check for eip binding at a different (faster) rate when none is bound.

eureka-core/src/main/java/com/netflix/eureka/DefaultEurekaServerConfig.java

@@ -164,6 +164,17 @@ public int getEIPBindRebindRetries() {
 
     }
 
+    /*
+     * (non-Javadoc)
+     *
+     * @see com.netflix.eureka.EurekaServerConfig#getEIPBindingRetryInterval()
+     */
+    @Override
+    public int getEIPBindingRetryIntervalMsWhenUnbound() {
+        return configInstance.getIntProperty(
+                namespace + "eipBindRebindRetryIntervalMsWhenUnbound", (1 * 60 * 1000)).get();
+    }
+
     /*
      * (non-Javadoc)
      *
@@ -172,8 +183,7 @@ public int getEIPBindRebindRetries() {
     @Override
     public int getEIPBindingRetryIntervalMs() {
         return configInstance.getIntProperty(
-                namespace + "eipBindRebindRetryIntervalMs", (5 * 60 * 1000))
-                .get();
+                namespace + "eipBindRebindRetryIntervalMs", (5 * 60 * 1000)).get();
     }
 
     /*

eureka-core/src/main/java/com/netflix/eureka/EurekaBootStrap.java

@@ -39,7 +39,6 @@
 import com.netflix.discovery.converters.XmlXStream;
 import com.netflix.eureka.aws.AwsBinder;
 import com.netflix.eureka.aws.AwsBinderDelegate;
-import com.netflix.eureka.aws.EIPManager;
 import com.netflix.eureka.cluster.PeerEurekaNodes;
 import com.netflix.eureka.registry.AwsInstanceRegistry;
 import com.netflix.eureka.registry.PeerAwareInstanceRegistry;

eureka-core/src/main/java/com/netflix/eureka/EurekaServerConfig.java

@@ -69,9 +69,22 @@ public interface EurekaServerConfig {
      */
     int getEIPBindRebindRetries();
 
+    /**
+     * Get the interval with which the server should check if the EIP is bound
+     * and should try to bind in the case if it is already not bound, iff the EIP
+     * is not currently bound.
+     * <p>
+     * <em>The changes are effective at runtime.</em>
+     * </p>
+     *
+     * @return the time in milliseconds.
+     */
+    int getEIPBindingRetryIntervalMsWhenUnbound();
+
     /**
      * Gets the interval with which the server should check if the EIP is bound
-     * and should try to bind in the case if it is already not bound.
+     * and should try to bind in the case if it is already not bound, iff the EIP
+     * is already bound. (so this refresh is just for steady state checks)
      * <p>
      * <em>The changes are effective at runtime.</em>
      * </p>

eureka-core/src/main/java/com/netflix/eureka/aws/EIPManager.java

@@ -141,39 +141,7 @@ private void handleEIPBinding() throws InterruptedException {
             }
         }
         // Schedule a timer which periodically checks for EIP binding.
-        scheduleEIPBindTask();
-    }
-
-    /**
-     * Schedules a EIP binding timer task which constantly polls for EIP in the
-     * same zone and binds it to itself.If the EIP is taken away for some
-     * reason, this task tries to get the EIP back. Hence it is advised to take
-     * one EIP assignment per instance in a zone.
-     *
-     */
-    private void scheduleEIPBindTask() {
-        timer.schedule(new TimerTask() {
-                           @Override
-                           public void run() {
-                               try {
-                                   // If the EIP is not bound, the registry could  be stale
-                                   // First sync up the registry from the neighboring node before
-                                   // trying to bind the EIP
-                                   if (!isEIPBound()) {
-                                       registry.clearRegistry();
-                                       int count = registry.syncUp();
-                                       registry.openForTraffic(applicationInfoManager, count);
-                                   } else {
-                                       // An EIP is already bound
-                                       return;
-                                   }
-                                   bindEIP();
-                               } catch (Throwable e) {
-                                   logger.error("Could not bind to EIP", e);
-                               }
-                           }
-                       }, serverConfig.getEIPBindingRetryIntervalMs(),
-                serverConfig.getEIPBindingRetryIntervalMs());
+        timer.schedule(new EIPBindingTask(), serverConfig.getEIPBindingRetryIntervalMsWhenUnbound());
     }
 
     /**
@@ -429,4 +397,39 @@ private AmazonEC2 getEC2Service() {
         ec2Service.setEndpoint("ec2." + region + ".amazonaws.com");
         return ec2Service;
     }
+
+    /**
+     * An EIP binding timer task which constantly polls for EIP in the
+     * same zone and binds it to itself.If the EIP is taken away for some
+     * reason, this task tries to get the EIP back. Hence it is advised to take
+     * one EIP assignment per instance in a zone.
+     */
+    private class EIPBindingTask extends TimerTask {
+        @Override
+        public void run() {
+            boolean isEIPBound = false;
+            try {
+                isEIPBound = isEIPBound();
+                // If the EIP is not bound, the registry could  be stale. First sync up the registry from the
+                // neighboring node before trying to bind the EIP
+                if (!isEIPBound) {
+                    registry.clearRegistry();
+                    int count = registry.syncUp();
+                    registry.openForTraffic(applicationInfoManager, count);
+                } else {
+                    // An EIP is already bound
+                    return;
+                }
+                bindEIP();
+            } catch (Throwable e) {
+                logger.error("Could not bind to EIP", e);
+            } finally {
+                if (isEIPBound) {
+                    timer.schedule(new EIPBindingTask(), serverConfig.getEIPBindingRetryIntervalMs());
+                } else {
+                    timer.schedule(new EIPBindingTask(), serverConfig.getEIPBindingRetryIntervalMsWhenUnbound());
+                }
+            }
+        }
+    };
 }