From ad954ff5f3c6ca74a1a7226e8ea20542a03ad0b8 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Fri, 2 Mar 2012 11:14:11 -0800 Subject: [PATCH] Fix element_id upgrade with network_id=0 --- server/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java index 6f4cb62ba15..c5c131959dc 100644 --- a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java @@ -688,7 +688,7 @@ public class Upgrade2214to30 implements DbUpgrade { try { s_logger.debug("Updating domain_router table"); pstmt = conn - .prepareStatement("UPDATE domain_router, virtual_router_providers vrp LEFT JOIN (physical_network_service_providers pnsp INNER JOIN networks ntwk INNER JOIN domain_router vr) ON (vrp.nsp_id = pnsp.id and pnsp.physical_network_id = ntwk.physical_network_id and ntwk.id=vr.network_id) SET vr.element_id=vrp.id;"); + .prepareStatement("UPDATE domain_router, virtual_router_providers vrp LEFT JOIN (physical_network_service_providers pnsp INNER JOIN physical_network pntwk INNER JOIN vm_instance vm INNER JOIN domain_router vr) ON (vrp.nsp_id = pnsp.id AND pnsp.physical_network_id = pntwk.id AND pntwk.data_center_id = vm.data_center_id AND vm.id=vr.id) SET vr.element_id=vrp.id;"); pstmt.executeUpdate(); } catch (SQLException e) { throw new CloudRuntimeException("Unable to update router table. ", e);