CLOUDSTACK-2303: upgrade failed from 2.2.14 to 4.1.0 - part2

ustcweizhou · chipchilders · commit a3a5c13427d6 · 2013-05-03T16:03:56.000+01:00
Signed-off-by: Chip Childers &lt;chip.childers@gmail.com&gt;
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
@@ -630,7 +630,7 @@ private void updateSystemVms(Connection conn){
     		//XenServer
     		try {
                //Get 3.0.0 or later xenserer system Vm template Id
-               pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name like 'systemvm-xenserver-%' and removed is null");
+               pstmt = conn.prepareStatement("select max(id) from `cloud`.`vm_template` where name like 'systemvm-xenserver-%' and removed is null");
     			rs = pstmt.executeQuery();
     			if(rs.next()){
     				long templateId = rs.getLong(1);
@@ -661,7 +661,7 @@ private void updateSystemVms(Connection conn){
     		s_logger.debug("Updating KVM System Vms");
     		try {
                //Get 3.0.0 or later KVM system Vm template Id
-               pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name like 'systemvm-kvm-%' and removed is null");
+               pstmt = conn.prepareStatement("select max(id) from `cloud`.`vm_template` where name like 'systemvm-kvm-%' and removed is null");
     			rs = pstmt.executeQuery();
     			if(rs.next()){
     				long templateId = rs.getLong(1);
@@ -692,7 +692,7 @@ private void updateSystemVms(Connection conn){
     		s_logger.debug("Updating VMware System Vms");
     		try {
                //Get 3.0.0 or later VMware system Vm template Id
-               pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name like 'systemvm-vmware-%' and removed is null");
+               pstmt = conn.prepareStatement("select max(id) from `cloud`.`vm_template` where name like 'systemvm-vmware-%' and removed is null");
     			rs = pstmt.executeQuery();
     			if(rs.next()){
     				long templateId = rs.getLong(1);
