CLOUDSTACK-3484: Removed method synchornization in libvirt and virtual router resources

Kishan Kavala · Kishan Kavala · commit ea3a77e2af12 · 2013-07-16T19:14:31.000+05:30
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -580,7 +580,7 @@ private String setLoadBalancerConfig(final String cfgFile,
         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 @@ protected synchronized Answer execute(final SavePasswordCommand cmd) {
         }
     }
 
-    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 @@ private Answer executeProxyLoadScan(final Command cmd, final long proxyVmId, fin
 
 
 
-    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);
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
@@ -2669,7 +2669,7 @@ private String doPingTest(final String domRIp, final String vmIp) {
         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 @@ protected void createVifs(VirtualMachineTO vmSpec,
         }
     }
 
-    protected synchronized StartAnswer execute(StartCommand cmd) {
+    protected StartAnswer execute(StartCommand cmd) {
         VirtualMachineTO vmSpec = cmd.getVirtualMachine();
         vmSpec.setVncAddr(cmd.getHostIp());
         String vmName = vmSpec.getName();

Original file line number	Diff line number	Diff line change
`@@ -2669,7 +2669,7 @@ private String doPingTest(final String domRIp, final String vmIp) {`
`2669`	`2669`	`return command.execute();`
`2670`	`2670`	`}`
`2671`	`2671`
`2672`		`- private synchronized Answer execute(MigrateCommand cmd) {`
	`2672`	`+ private Answer execute(MigrateCommand cmd) {`
`2673`	`2673`	`String vmName = cmd.getVmName();`
`2674`	`2674`
`2675`	`2675`	`State state = null;`
`@@ -3267,7 +3267,7 @@ protected void createVifs(VirtualMachineTO vmSpec,`
`3267`	`3267`	`}`
`3268`	`3268`	`}`
`3269`	`3269`
`3270`		`- protected synchronized StartAnswer execute(StartCommand cmd) {`
	`3270`	`+ protected StartAnswer execute(StartCommand cmd) {`
`3271`	`3271`	`VirtualMachineTO vmSpec = cmd.getVirtualMachine();`
`3272`	`3272`	`vmSpec.setVncAddr(cmd.getHostIp());`
`3273`	`3273`	`String vmName = vmSpec.getName();`