Updated Branches: refs/heads/master af696e6ff -> ea3a77e2a
CLOUDSTACK-3484: Removed method synchornization in libvirt and virtual router resources Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ea3a77e2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea3a77e2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea3a77e2 Branch: refs/heads/master Commit: ea3a77e2af1279ebe3a18cff479def07cc155560 Parents: af696e6 Author: Kishan Kavala <[email protected]> Authored: Tue Jul 16 19:06:49 2013 +0530 Committer: Kishan Kavala <[email protected]> Committed: Tue Jul 16 19:14:31 2013 +0530 ---------------------------------------------------------------------- .../agent/resource/virtualnetwork/VirtualRoutingResource.java | 6 +++--- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea3a77e2/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index 4f0ccec..32fd728 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -580,7 +580,7 @@ public class VirtualRoutingResource implements Manager { return command.execute(); } - protected synchronized Answer execute(final SavePasswordCommand cmd) { + protected Answer execute(final SavePasswordCommand cmd) { final String password = cmd.getPassword(); final String routerPrivateIPAddress = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP); final String vmName = cmd.getVmName(); @@ -596,7 +596,7 @@ public class VirtualRoutingResource implements Manager { } } - protected synchronized Answer execute (final DhcpEntryCommand cmd) { + protected Answer execute (final DhcpEntryCommand cmd) { final Script command = new Script(_dhcpEntryPath, _timeout, s_logger); command.add("-r", cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP)); if (cmd.getVmIpAddress() != null) { @@ -866,7 +866,7 @@ public class VirtualRoutingResource implements Manager { - public synchronized String savePassword(final String privateIpAddress, final String vmIpAddress, final String password, final String localPath) { + public String savePassword(final String privateIpAddress, final String vmIpAddress, final String password, final String localPath) { final Script command = new Script(_savepasswordPath, _startTimeout, s_logger); command.add("-r", privateIpAddress); command.add("-v", vmIpAddress); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea3a77e2/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 85a8fa0..e51fbda 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -2669,7 +2669,7 @@ ServerResource { return command.execute(); } - private synchronized Answer execute(MigrateCommand cmd) { + private Answer execute(MigrateCommand cmd) { String vmName = cmd.getVmName(); State state = null; @@ -3267,7 +3267,7 @@ ServerResource { } } - protected synchronized StartAnswer execute(StartCommand cmd) { + protected StartAnswer execute(StartCommand cmd) { VirtualMachineTO vmSpec = cmd.getVirtualMachine(); vmSpec.setVncAddr(cmd.getHostIp()); String vmName = vmSpec.getName();
