add more checks in alloctor

edisonSu · edisonSu · commit e99cc740e64a · 2010-12-04T14:59:39.000-08:00
diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -56,21 +56,31 @@ public DeployDestination plan(VirtualMachineProfile vmProfile,
 		
 		/*Go through all the pods/clusters under zone*/
 		List<HostPodVO> pods = _podDao.listByDataCenterId(plan.getDataCenterId());
-		Collections.shuffle(pods);
+		//Collections.shuffle(pods);
 		
 		for (HostPodVO hostPod : pods) {
 			List<ClusterVO> clusters = _clusterDao.listByPodId(hostPod.getId());
-			Collections.shuffle(clusters);
+			//Collections.shuffle(clusters);
 			
 			for (ClusterVO clusterVO : clusters) {
+				
+				if (clusterVO.getHypervisorType() != vmProfile.getHypervisorType()) {
+					continue;
+				}
+				
 				List<HostVO> hosts = _hostDao.listByCluster(clusterVO.getId());
-				Collections.shuffle(hosts);
+				//Collections.shuffle(hosts);
+				
 				
 				for (HostVO hostVO : hosts) {
 					if (hostVO.getStatus() != Status.Up) {
 						continue;
 					}
 					
+					if (avoid.shouldAvoid(hostVO)) {
+						continue;
+					}
+					
 					boolean canDeployToHost = deployToHost(hostVO.getId(), cpu_requested, ram_requested, false);
 					if (canDeployToHost) {
 						Pod pod = _podDao.findById(hostPod.getId());
@@ -126,11 +136,12 @@ private boolean deployToHost(Long hostId, Integer cpu, long ram, boolean fromLas
     			_capacityDao.update(capacityMem.getId(), capacityMem);
         	}
         	
-        	return success;
-        } finally {
         	txn.commit();
-        }
-		
+        	return success;
+        } catch (Exception e) {
+        	txn.rollback();
+        	return false;
+        }        		
 	}
 	@Override
 	public boolean check(VirtualMachineProfile vm, DeploymentPlan plan,
diff --git a/server/src/com/cloud/vm/VMStateListener.java b/server/src/com/cloud/vm/VMStateListener.java
@@ -114,8 +114,9 @@ private void releaseResource(VMInstanceVO vm, boolean moveFromReserved, boolean
 
         	_capacityDao.update(capacityCpu.getId(), capacityCpu);
         	_capacityDao.update(capacityMemory.getId(), capacityMemory);
-        } finally {
         	txn.commit();
+        } catch (Exception e) {
+        	txn.rollback();
         }
 	}
 }
diff --git a/utils/src/com/cloud/utils/fsm/StateMachine2.java b/utils/src/com/cloud/utils/fsm/StateMachine2.java
@@ -24,6 +24,9 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.Transaction;
+
 /**
  * StateMachine is a partial implementation of a finite state machine.
  * Specifically, it implements the Moore machine.
@@ -94,6 +97,7 @@ public List<S> getFromStates(S s, E e) {
         return entry.prevStates.get(e);
     }
     
+    @DB
     public boolean transitTO(V vo, E e) {
     	S currentState = vo.getState();
     	S nextState = getNextState(currentState, e);
@@ -102,13 +106,23 @@ public boolean transitTO(V vo, E e) {
     	if (nextState == null) {
     		transitionStatus = false;
     	}
+
+    	Transaction txn = Transaction.currentTxn();
+    	txn.start();
     	
-    	transitionStatus = _instanceDao.updateState(currentState, e, nextState, vo);
+    	try {
     	
-    	for (StateListener<S,E, V> listener : _listeners) {
-    		listener.processStateTransitionEvent(currentState, e, nextState, vo, transitionStatus);
-    	}
+    		transitionStatus = _instanceDao.updateState(currentState, e, nextState, vo);
+
+    		for (StateListener<S,E, V> listener : _listeners) {
+    			listener.processStateTransitionEvent(currentState, e, nextState, vo, transitionStatus);
+    		}
+    		txn.commit();
     	
+    	} catch (Exception ex) {
+    		txn.rollback();
+    	}
+
     	return transitionStatus;
     }
     

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,9 @@ private void releaseResource(VMInstanceVO vm, boolean moveFromReserved, boolean`
`114`	`114`
`115`	`115`	`_capacityDao.update(capacityCpu.getId(), capacityCpu);`
`116`	`116`	`_capacityDao.update(capacityMemory.getId(), capacityMemory);`
`117`		`- } finally {`
`118`	`117`	`txn.commit();`
	`118`	`+ } catch (Exception e) {`
	`119`	`+ txn.rollback();`
`119`	`120`	`}`
`120`	`121`	`}`
`121`	`122`	`}`