From 639ddbb45cacd0e0d86ef33b549dcec96bcdd487 Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 24 Jan 2011 10:04:24 -0800 Subject: [PATCH] ovs managers: handle execption along with Alex's convention --- .../com/cloud/network/ovs/OvsListener.java | 4 ++-- .../cloud/network/ovs/OvsNetworkManager.java | 4 ++-- .../network/ovs/OvsNetworkManagerImpl.java | 24 ++++++++++++------- .../network/ovs/OvsTunnelManagerImpl.java | 2 +- .../VirtualNetworkApplianceManagerImpl.java | 12 ++++------ .../src/com/cloud/vm/UserVmManagerImpl.java | 12 ++++------ 6 files changed, 30 insertions(+), 28 deletions(-) diff --git a/server/src/com/cloud/network/ovs/OvsListener.java b/server/src/com/cloud/network/ovs/OvsListener.java index d66678e9dc7..6b89d1ac369 100644 --- a/server/src/com/cloud/network/ovs/OvsListener.java +++ b/server/src/com/cloud/network/ovs/OvsListener.java @@ -68,7 +68,7 @@ public class OvsListener implements Listener { // TODO: handle delete failure } } catch (Exception e) { - e.printStackTrace(); + s_logger.warn("process answer failed", e); } if (failedFlowVms.size() > 0) { _ovsNetworkMgr.scheduleFlowUpdateToHosts(failedFlowVms, false, new Long(10*1000l)); @@ -141,7 +141,7 @@ public class OvsListener implements Listener { } } } catch (Exception e) { - e.printStackTrace(); + s_logger.warn("process connect failed", e); } } diff --git a/server/src/com/cloud/network/ovs/OvsNetworkManager.java b/server/src/com/cloud/network/ovs/OvsNetworkManager.java index 6931886ca04..dfcf38cdc76 100644 --- a/server/src/com/cloud/network/ovs/OvsNetworkManager.java +++ b/server/src/com/cloud/network/ovs/OvsNetworkManager.java @@ -17,7 +17,7 @@ public interface OvsNetworkManager extends Manager { public boolean isOvsNetworkEnabled(); public void UserVmCheckAndCreateTunnel(Commands cmds, - VirtualMachineProfile profile, DeployDestination dest) throws GreTunnelException; + VirtualMachineProfile profile, DeployDestination dest); public void applyDefaultFlowToUserVm(Commands cmds, VirtualMachineProfile profile, DeployDestination dest); @@ -30,7 +30,7 @@ public interface OvsNetworkManager extends Manager { public void RouterCheckAndCreateTunnel(Commands cmds, VirtualMachineProfile profile, - DeployDestination dest) throws GreTunnelException; + DeployDestination dest); public void fullSync(List> states); diff --git a/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java b/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java index 070f14877da..23439e66a09 100644 --- a/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java +++ b/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java @@ -399,7 +399,7 @@ public class OvsNetworkManagerImpl implements OvsNetworkManager { handleCreateTunnelAnswer(answers); } } catch (Exception e) { - e.printStackTrace(); + s_logger.warn("Ovs vlan remap network creates tunnel failed", e); } } @@ -448,7 +448,7 @@ public class OvsNetworkManagerImpl implements OvsNetworkManager { tag, vlans, Long.toString(log.getLogsequence()), instance .getId())); } catch (OvsVlanExhaustedException e) { - e.printStackTrace(); + s_logger.warn("vlan exhaused on host " + instance.getHostId(), e); } } @@ -484,7 +484,7 @@ public class OvsNetworkManagerImpl implements OvsNetworkManager { router.getName(), tag, vlans, Long.toString(log.getLogsequence()), instance.getId())); _agentMgr.send(router.getHostId(), cmds, _ovsListener); } catch (Exception e) { - e.printStackTrace(); + s_logger.warn("apply flow to router failed", e); } } @@ -608,7 +608,7 @@ public class OvsNetworkManagerImpl implements OvsNetworkManager { Commands cmds = new Commands(new OvsDeleteFlowCommand(instance.getName())); _agentMgr.send(hostId, cmds, _ovsListener); } catch (Exception e) { - e.printStackTrace(); + s_logger.warn("remove flow failed", e); } } @@ -640,15 +640,23 @@ public class OvsNetworkManagerImpl implements OvsNetworkManager { @Override public void UserVmCheckAndCreateTunnel(Commands cmds, - VirtualMachineProfile profile, DeployDestination dest) throws GreTunnelException { - CheckAndCreateTunnel(profile.getVirtualMachine(), dest); + VirtualMachineProfile profile, DeployDestination dest) { + try { + CheckAndCreateTunnel(profile.getVirtualMachine(), dest); + } catch (Exception e) { + s_logger.warn("create gre tunnel failed", e); + } } @Override public void RouterCheckAndCreateTunnel(Commands cmds, VirtualMachineProfile profile, - DeployDestination dest) throws GreTunnelException { - CheckAndCreateTunnel(profile.getVirtualMachine(), dest); + DeployDestination dest) { + try { + CheckAndCreateTunnel(profile.getVirtualMachine(), dest); + } catch (Exception e) { + s_logger.warn("create gre tunnel failed", e); + } } @Override diff --git a/server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java index b2519269522..5c909876d49 100644 --- a/server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java +++ b/server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java @@ -196,7 +196,7 @@ public class OvsTunnelManagerImpl implements OvsTunnelManager { handleCreateTunnelAnswer(answers); } } catch (Exception e) { - e.printStackTrace(); + s_logger.debug("Ovs Tunnel network created tunnel failed", e); } } diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index c5e68b094f8..1f67ca758d0 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1099,14 +1099,10 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian @Override public boolean finalizeDeployment(Commands cmds, VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) throws ResourceUnavailableException{ NicProfile controlNic = (NicProfile) profile.getParameter("control.nic"); - try { - _ovsNetworkMgr.RouterCheckAndCreateTunnel(cmds, profile, dest); - _ovsNetworkMgr.applyDefaultFlowToRouter(cmds, profile, dest); - _ovsTunnelMgr.RouterCheckAndCreateTunnel(cmds, profile, dest); - } catch (GreTunnelException e) { - e.printStackTrace(); - } - + + _ovsNetworkMgr.RouterCheckAndCreateTunnel(cmds, profile, dest); + _ovsNetworkMgr.applyDefaultFlowToRouter(cmds, profile, dest); + _ovsTunnelMgr.RouterCheckAndCreateTunnel(cmds, profile, dest); cmds.addCommand("checkSsh", new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922, 5, 20)); diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 230a3cc8701..affc1134165 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2211,13 +2211,11 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager _vmDao.update(userVm.getId(), userVm); - try { - _ovsNetworkMgr.UserVmCheckAndCreateTunnel(cmds, profile, dest); - _ovsNetworkMgr.applyDefaultFlowToUserVm(cmds, profile, dest); - _ovsTunnelMgr.UserVmCheckAndCreateTunnel(cmds, profile, dest); - } catch (GreTunnelException e) { - e.printStackTrace(); - } + + _ovsNetworkMgr.UserVmCheckAndCreateTunnel(cmds, profile, dest); + _ovsNetworkMgr.applyDefaultFlowToUserVm(cmds, profile, dest); + _ovsTunnelMgr.UserVmCheckAndCreateTunnel(cmds, profile, dest); + return true; }