fix to state check queue arrival, disable volatile instance updates b…

…y default
eucalyptus · Jan 26, 2012 · 419312a · 419312a
2 parents 3250cd5 + 0eb5e32
commit 419312a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstances.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstances.java
@@ -232,7 +232,7 @@ protected boolean inState( final VmState state ) {
   public static String    INSTANCE_SUBDOMAIN            = ".eucalyptus";
   @ConfigurableField( description = "Period (in seconds) between state updates for actively changing state.",
                       initial = "3" )
-  public static Long      VOLATILE_STATE_INTERVAL_SEC   = 3l;
+  public static Long      VOLATILE_STATE_INTERVAL_SEC   = Long.MAX_VALUE;
   @ConfigurableField( description = "Timeout (in seconds) before a requested instance terminate will be repeated.",
                       initial = "60" )
   public static Long      VOLATILE_STATE_TIMEOUT_SEC    = 60l;

diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Databases.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Databases.java
@@ -168,7 +168,7 @@ public DatabaseStateException( String string ) {
   }
 
   private static final int                    MAX_TX_START_SYNC_RETRIES = 120;
-  private static final AtomicInteger          counter                   = new AtomicInteger( 120 );
+  private static final AtomicInteger          counter                   = new AtomicInteger( 500 );
   private static final Predicate<Host>        FILTER_SYNCING_DBS        = Predicates.and( DbFilter.INSTANCE, Predicates.not( SyncedDbFilter.INSTANCE ) );
   private static final ScriptedDbBootstrapper singleton                 = new ScriptedDbBootstrapper( );
   private static Logger                       LOG                       = Logger.getLogger( Databases.class );

diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/Topology.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/Topology.java
@@ -74,9 +74,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 import org.apache.log4j.Logger;
 import com.eucalyptus.bootstrap.Bootstrap;
 import com.eucalyptus.bootstrap.BootstrapArgs;
@@ -169,33 +168,34 @@ public <C> Future<C> enqueue( final Callable<C> call ) {
   private enum TopologyTimer implements EventListener<ClockTick> {
     INSTANCE;
     private static final AtomicInteger counter = new AtomicInteger( 0 );
-    private static final Lock          canHas  = new ReentrantLock( );
+    private static final AtomicBoolean busy  = new AtomicBoolean( false );
 
     @Override
     public void fireEvent( final ClockTick event ) {
-      if ( Hosts.isCoordinator( ) && canHas.tryLock( ) ) {
-        Queue.INTERNAL.enqueue( new Callable<Object>( ) {
-          public Object call( ) {
-            try {
-              return RunChecks.INSTANCE.call( );
-            } finally {
-              canHas.unlock( );
-            }
-          }
-        } );
-      } else if ( counter.incrementAndGet( ) % 3 == 0 && canHas.tryLock( ) ) {
-        Queue.INTERNAL.enqueue( new Callable<Object>( ) {
-          public Object call( ) {
-            try {
-              return RunChecks.INSTANCE.call( );
-            } finally {
-              canHas.unlock( );
-            }
+      Callable<Object> call = new Callable<Object>( ) {
+        public Object call( ) {
+          try {
+            TimeUnit.SECONDS.sleep( 10 );
+            return RunChecks.INSTANCE.call( );
+          } catch ( InterruptedException ex ) {
+            return Exceptions.maybeInterrupted( ex );
+          } finally {
+            busy.set( false );
           }
-        } );
-      } else if ( counter.incrementAndGet( ) > 10 ) {
-        counter.set( 0 );
-        Queue.INTERNAL.enqueue( RunChecks.INSTANCE );
+        }
+      };
+      if ( Hosts.isCoordinator( ) && busy.compareAndSet( false, true ) ) {
+        try {
+          Queue.INTERNAL.enqueue( call );
+        } catch ( Exception ex ) {
+          busy.set( false );
+        }
+      } else if ( counter.incrementAndGet( ) % 3 == 0 && busy.compareAndSet( false, true ) ) {
+        try {
+          Queue.INTERNAL.enqueue( call );
+        } catch ( Exception ex ) {
+          busy.set( false );
+        }
       }
     }
 
@@ -730,7 +730,7 @@ enum WaitForResults implements Predicate<Future> {
     @Override
     public boolean apply( final Future input ) {
       try {
-        final Object conf = input.get( 30, TimeUnit.SECONDS );
+        final Object conf = input.get( 120, TimeUnit.SECONDS );
         return true;
       } catch ( final InterruptedException ex ) {
         Thread.currentThread( ).interrupt( );