cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject git commit: updated refs/heads/vmsync to eaf30b8
Date Mon, 17 Jun 2013 23:19:13 GMT
Updated Branches:
  refs/heads/vmsync 40dbc5499 -> eaf30b835


Fix assertion issue found in DedicatedResourceDaoImpl.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eaf30b83
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eaf30b83
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eaf30b83

Branch: refs/heads/vmsync
Commit: eaf30b8355336a8ce23548c7592b00641d15ea8d
Parents: 40dbc54
Author: Kelven Yang <kelveny@gmail.com>
Authored: Mon Jun 17 16:11:55 2013 -0700
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Mon Jun 17 16:11:55 2013 -0700

----------------------------------------------------------------------
 .../com/cloud/vm/VirtualMachineManagerImpl.java | 45 ++++++++++++++++++--
 .../cloud/dc/dao/DedicatedResourceDaoImpl.java  |  2 +-
 2 files changed, 42 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eaf30b83/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 74219bd..1f2ca57 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -3432,7 +3432,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
     			s_logger.warn("VM " + vmId + " no longer exists when processing VM state report");
     		}
     	} else {
-    		// TODO, wake-up signalling
+    		// TODO, do job wake-up signalling, since currently async job wake-up is not in use
+    		// we will skip it for nows
     	}
     }
     
@@ -3546,7 +3547,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
     	//
     	// Therefor, we will scan thoses VMs on UP host based on last update timestamp, if the
host is UP
     	// and a VM stalls for status update, we will consider them to be powered off 
-    	// (which is relatively safe to do so) 
+    	// (which is relatively safe to do so)
     	
     	long stallThresholdInMs = _pingInterval.value() + (_pingInterval.value() >> 1);
     	Date cutTime = new Date(DateUtil.currentGMTTime().getTime() - stallThresholdInMs);
@@ -3556,6 +3557,16 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
     		assert(vm != null);
     		handlePowerOffReportWithNoPendingJobsOnVM(vm);
     	}
+    	
+    	List<Long> vmsWithRecentReport = listVMInTransitionStateWithRecentReportOnUpHost(hostId,
cutTime);
+    	for(Long vmId : vmsWithRecentReport) {
+    		VMInstanceVO vm = _vmDao.findById(vmId);
+    		assert(vm != null);
+    		if(vm.getPowerState() == PowerState.PowerOn)
+    			handlePowerOnReportWithNoPendingJobsOnVM(vm);
+    		else
+    			handlePowerOffReportWithNoPendingJobsOnVM(vm);
+    	}
     }
     
     private void scanStalledVMInTransitionStateOnDisconnectedHosts() {
@@ -3570,8 +3581,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
     	}
     }
     
-    // TODO, use sql query directly for quick prototype, need to refactor to use joins and
search builders
-    // if it supports
+    
+    // VMs that in transitional state without recent power state report
     @DB
     private List<Long> listStalledVMInTransitionStateOnUpHost(long hostId, Date cutTime)
{
     	String sql = "SELECT i.* FROM vm_instance as i, host as h WHERE h.status = 'UP' " +

@@ -3597,6 +3608,32 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
         return l;
     }
     
+    // VMs that in transitional state and recently have power state update
+    @DB
+    private List<Long> listVMInTransitionStateWithRecentReportOnUpHost(long hostId,
Date cutTime) {
+    	String sql = "SELECT i.* FROM vm_instance as i, host as h WHERE h.status = 'UP' " +

+                     "AND h.id = ? AND i.power_state_update_time > ? AND i.host_id = h.id
" +
+    			     "AND (i.state ='Starting' OR i.state='Stopping' OR i.state='Migrating') " + 
+    			     "AND i.id NOT IN (SELECT vm_instance_id FROM vm_work_job)";
+    	
+    	List<Long> l = new ArrayList<Long>();
+        Transaction txn = Transaction.currentTxn();;
+        PreparedStatement pstmt = null;
+        try {
+            pstmt = txn.prepareAutoCloseStatement(sql);
+            
+            pstmt.setLong(1, hostId);
+ 	        pstmt.setString(2, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), cutTime));
+            ResultSet rs = pstmt.executeQuery();
+            while(rs.next()) {
+            	l.add(rs.getLong(1));
+            }
+        } catch (SQLException e) {
+        } catch (Throwable e) {
+        }
+        return l;
+    }
+    
     @DB
     private List<Long> listStalledVMInTransitionStateOnDisconnectedHosts(Date cutTime)
{
     	String sql = "SELECT i.* FROM vm_instance as i, host as h WHERE h.status != 'UP' " +


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eaf30b83/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java b/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java
index 2a3b469..e8c5010 100644
--- a/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java
+++ b/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java
@@ -206,7 +206,7 @@ public class DedicatedResourceDaoImpl extends GenericDaoBase<DedicatedResourceVO
     public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedZones(Long
dataCenterId, Long domainId, Long accountId){
         SearchCriteria<DedicatedResourceVO> sc = ListAllZonesSearch.create();
         if (dataCenterId != null) {
-            sc.setParameters("dataCenterId", dataCenterId);
+            sc.setParameters("zoneId", dataCenterId);
         }
         if(domainId != null) {
             sc.setParameters("domainId", domainId);


Mime
View raw message