Fix errors in bringing up user VM under new VMsync framework

kelveny · kelveny · commit 35ea8e149d57 · 2013-06-12T12:05:26.000-07:00
diff --git a/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
@@ -53,6 +53,7 @@ public NicDaoImpl() {
         AllFieldsSearch.and("broadcastUri", AllFieldsSearch.entity().getBroadcastUri(), Op.EQ);
         AllFieldsSearch.and("secondaryip", AllFieldsSearch.entity().getSecondaryIp(), Op.EQ);
         AllFieldsSearch.and("nicid", AllFieldsSearch.entity().getId(), Op.EQ);
+        AllFieldsSearch.and("strategy", AllFieldsSearch.entity().getReservationStrategy(), Op.EQ);
         AllFieldsSearch.done();
 
         IpSearch = createSearchBuilder(String.class);
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java
@@ -141,6 +141,12 @@ public void unregisterActiveTask(long jobId) {
 		}
 	}
 	
+	public boolean isJobActive(long jobId) {
+		synchronized(this) {
+			return _activeTasks.get(jobId) != null;
+		}
+	}
+	
 	public int getActivePoolThreads() {
 		return _activePoolThreads;
 	}
diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java
@@ -535,13 +535,17 @@ public void run() {
                     }
 
                     if((getAndResetPendingSignals(job) & AsyncJobConstants.SIGNAL_MASK_WAKEUP) != 0) {
-                    	AsyncJobDispatcher jobDispatcher = getWakeupDispatcher(job);
-                    	if(jobDispatcher != null) {
-                    		jobDispatcher.runJob(job);
-                    	} else {
-                    		s_logger.error("Unable to find a wakeup dispatcher from the joined job. job-" + job.getId());
+                    	if(!_jobMonitor.isJobActive(job.getId())) {
+	                    	AsyncJobDispatcher jobDispatcher = getWakeupDispatcher(job);
+	                    	if(jobDispatcher != null) {
+	                    		jobDispatcher.runJob(job);
+	                    	} else {
+	                    		s_logger.error("Unable to find a wakeup dispatcher from the joined job. job-" + job.getId());
+	                    	}
                     	}
                     } else {
+                    	assert(_jobMonitor.isJobActive(job.getId()));
+                    	
 	                    AsyncJobDispatcher jobDispatcher = getDispatcher(job.getDispatcher());
 	                    if(jobDispatcher != null) {
 	                    	jobDispatcher.runJob(job);
diff --git a/server/src/com/cloud/vm/VmWorkStart.java b/server/src/com/cloud/vm/VmWorkStart.java
@@ -51,19 +51,23 @@ public VmWorkStart() {
 	}
 
 	public DeploymentPlan getPlan() {
-		// this is ugly, to work with legacy code, we need to re-construct the DeploymentPlan hard-codely
-		// this has to be refactored together with migrating legacy code into the new way
 		
-		ReservationContext context = null;
-		if(reservationId != null) {
-	        Journal journal = new Journal.LogJournal("VmWorkStart", s_logger);
-			context = new ReservationContextImpl(reservationId, journal, CallContext.current().getCallingUser(), CallContext.current().getCallingAccount());
+		if(podId != null || clusterId != null || hostId != null || poolId != null || physicalNetworkId != null) {
+			// this is ugly, to work with legacy code, we need to re-construct the DeploymentPlan hard-codely
+			// this has to be refactored together with migrating legacy code into the new way
+			ReservationContext context = null;
+			if(reservationId != null) {
+		        Journal journal = new Journal.LogJournal("VmWorkStart", s_logger);
+				context = new ReservationContextImpl(reservationId, journal, CallContext.current().getCallingUser(), CallContext.current().getCallingAccount());
+			}
+			
+			DeploymentPlan plan = new DataCenterDeployment(
+					dcId, podId, clusterId, hostId, poolId, physicalNetworkId, 
+					context);
+			return plan;
 		}
 		
-		DeploymentPlan plan = new DataCenterDeployment(
-				dcId, podId, clusterId, hostId, poolId, physicalNetworkId, 
-				context);
-		return plan;
+		return null;
 	}
 
 	public void setPlan(DeploymentPlan plan) {
diff --git a/server/test/com/cloud/vm/VmWorkMockVirtualMachineManagerImpl.java b/server/test/com/cloud/vm/VmWorkMockVirtualMachineManagerImpl.java
@@ -17,7 +17,6 @@
 package com.cloud.vm;
 
 import java.net.URI;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -165,18 +164,6 @@ public void registerGuru(Type type, VirtualMachineGuru guru) {
 		
 	}
 
-	@Override
-    public Collection<VirtualMachineGuru> getRegisteredGurus() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-    @Override
-    public VirtualMachineGuru getVmGuru(VirtualMachine vm) {
-		// TODO Auto-generated method stub
-    	return null;
-    }
-
 	@Override
 	public boolean stateTransitTo(VMInstanceVO vm, Event e, Long hostId)
 			throws NoTransitionException {

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,12 @@ public void unregisterActiveTask(long jobId) {`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
	`144`	`+ public boolean isJobActive(long jobId) {`
	`145`	`+ synchronized(this) {`
	`146`	`+ return _activeTasks.get(jobId) != null;`
	`147`	`+ }`
	`148`	`+ }`
	`149`	`+`
`144`	`150`	`public int getActivePoolThreads() {`
`145`	`151`	`return _activePoolThreads;`
`146`	`152`	`}`