fix vm instance issue

eucalyptus · Oct 15, 2011 · 7b680f5 · 7b680f5
1 parent b013a00
commit 7b680f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmControl.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmControl.java
@@ -170,7 +170,7 @@ public class VmControl {
   public static RunInstancesResponseType runInstances( RunInstancesType request ) throws MetadataException, AuthException {
     Allocation allocInfo = Allocations.begin( request );
     try {
-      Predicates.and( VerifyMetadata.get( ), AdmissionControl.get( ), ClusterAllocator.get( ) ).apply( allocInfo );
+      Predicates.and( VerifyMetadata.get( ), AdmissionControl.get( ) ).apply( allocInfo );
     } catch ( Exception ex1 ) {
       LOG.trace( ex1, ex1 );
     }
@@ -192,6 +192,7 @@ public String apply( NetworkGroup arg0 ) {
         reservation.getInstancesSet( ).add( VmInstances.transform( entity ) );
       }
       db.commit( );
+      ClusterAllocator.get( ).apply( allocInfo );
     } catch ( Exception ex ) {
       Logs.exhaust( ).error( ex, ex );
       db.rollback( );

diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java
@@ -24,7 +24,7 @@
 
 @SuppressWarnings( "unchecked" )
 public class PersistenceContexts {
-  public static int                                     MAX_FAIL        = 5;
+  private static int                                     MAX_FAIL        = 5;
   private static AtomicInteger                          failCount       = new AtomicInteger( 0 );
   private static Logger                                 LOG             = Logger.getLogger( PersistenceContexts.class );
   private static final ArrayListMultimap<String, Class> entities        = ArrayListMultimap.create( );