Updated Branches:
refs/heads/master-6-17-stable 21e2bf480 -> 0035bbba3
Reverting the commit for parallel vm deployment, from beta branch
Revert "CLOUDSTACK-2843: Provideded an ability to turn off the synchronization
being done on the CS agent side,"
This reverts commit 0fe7c5c9353eb1970238015cf48668d196adf82d.
Conflicts:
server/src/com/cloud/configuration/Config.java
setup/db/db/schema-410to420.sql
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0035bbba
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0035bbba
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0035bbba
Branch: refs/heads/master-6-17-stable
Commit: 0035bbba34d57c6b6bc35d5ada751235e7a7fb35
Parents: 21e2bf4
Author: Alena Prokharchyk <[email protected]>
Authored: Thu Jun 27 11:51:34 2013 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Thu Jun 27 11:51:34 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/network/NetworkModel.java | 2 --
core/src/com/cloud/agent/api/StartCommand.java | 10 +++---
core/src/com/cloud/agent/api/StopCommand.java | 15 +++------
.../agent/api/routing/DhcpEntryCommand.java | 10 +++---
.../agent/api/routing/SavePasswordCommand.java | 6 ++--
.../agent/api/routing/UserDataCommand.java | 6 ++--
.../cloud/agent/api/routing/VmDataCommand.java | 10 +++---
.../agent/api/storage/CopyVolumeCommand.java | 6 ++--
.../cloud/agent/api/storage/CreateCommand.java | 32 +++++++++-----------
.../motion/AncientDataMotionStrategy.java | 18 ++++-------
.../systemvm/debian/config/root/edithosts.sh | 4 +--
.../systemvm/debian/config/root/savepassword.sh | 4 +--
patches/systemvm/debian/config/root/userdata.sh | 4 +--
.../BaremetalDhcpManagerImpl.java | 5 +--
.../networkservice/BaremetalPxeManagerImpl.java | 4 +--
.../CloudStackPrimaryDataStoreDriverImpl.java | 10 +++---
server/src/com/cloud/configuration/Config.java | 7 ++---
.../src/com/cloud/network/NetworkManager.java | 1 -
.../com/cloud/network/NetworkManagerImpl.java | 4 +--
.../src/com/cloud/network/NetworkModelImpl.java | 11 -------
.../element/CloudZonesNetworkElement.java | 4 +--
.../VirtualNetworkApplianceManagerImpl.java | 7 ++---
.../src/com/cloud/server/ManagementServer.java | 2 --
.../com/cloud/server/ManagementServerImpl.java | 14 ++-------
.../com/cloud/vm/VirtualMachineManagerImpl.java | 15 ++++-----
.../com/cloud/network/MockNetworkModelImpl.java | 6 ----
.../com/cloud/vpc/MockNetworkModelImpl.java | 6 ----
setup/db/db/schema-410to420.sql | 3 +-
28 files changed, 73 insertions(+), 153 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/api/src/com/cloud/network/NetworkModel.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkModel.java
b/api/src/com/cloud/network/NetworkModel.java
index ea39d83..05307eb 100644
--- a/api/src/com/cloud/network/NetworkModel.java
+++ b/api/src/com/cloud/network/NetworkModel.java
@@ -274,6 +274,4 @@ public interface NetworkModel {
Networks.IsolationType[] listNetworkIsolationMethods();
Nic getNicInNetworkIncludingRemoved(long vmId, long networkId);
-
- boolean getExecuteInSeqNtwkElmtCmd();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/core/src/com/cloud/agent/api/StartCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartCommand.java
b/core/src/com/cloud/agent/api/StartCommand.java
index 308730a..ec707d6 100644
--- a/core/src/com/cloud/agent/api/StartCommand.java
+++ b/core/src/com/cloud/agent/api/StartCommand.java
@@ -24,7 +24,6 @@ import com.cloud.host.Host;
public class StartCommand extends Command {
VirtualMachineTO vm;
String hostIp;
- boolean executeInSequence = false;
public VirtualMachineTO getVirtualMachine() {
return vm;
@@ -32,16 +31,19 @@ public class StartCommand extends Command {
@Override
public boolean executeInSequence() {
- return executeInSequence;
+ return true;
}
protected StartCommand() {
}
- public StartCommand(VirtualMachineTO vm, Host host, boolean
executeInSequence) {
+ public StartCommand(VirtualMachineTO vm) {
+ this.vm = vm;
+ }
+
+ public StartCommand(VirtualMachineTO vm, Host host) {
this.vm = vm;
this.hostIp = host.getPrivateIpAddress();
- this.executeInSequence = executeInSequence;
}
public String getHostIp() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/core/src/com/cloud/agent/api/StopCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StopCommand.java
b/core/src/com/cloud/agent/api/StopCommand.java
index a3ee3c9..1c67f38 100755
--- a/core/src/com/cloud/agent/api/StopCommand.java
+++ b/core/src/com/cloud/agent/api/StopCommand.java
@@ -23,33 +23,28 @@ public class StopCommand extends RebootCommand {
private boolean isProxy=false;
private String urlPort=null;
private String publicConsoleProxyIpAddress=null;
- boolean executeInSequence = false;
protected StopCommand() {
}
- public StopCommand(VirtualMachine vm, boolean isProxy, String urlPort,
String publicConsoleProxyIpAddress, boolean executeInSequence) {
+ public StopCommand(VirtualMachine vm, boolean isProxy, String urlPort,
String publicConsoleProxyIpAddress) {
super(vm);
this.isProxy = isProxy;
this.urlPort = urlPort;
this.publicConsoleProxyIpAddress = publicConsoleProxyIpAddress;
- this.executeInSequence = executeInSequence;
}
- public StopCommand(VirtualMachine vm, String vnet, boolean
executeInSequence) {
+ public StopCommand(VirtualMachine vm, String vnet) {
super(vm);
this.vnet = vnet;
- this.executeInSequence = executeInSequence;
}
- public StopCommand(VirtualMachine vm, boolean executeInSequence) {
+ public StopCommand(VirtualMachine vm) {
super(vm);
- this.executeInSequence = executeInSequence;
}
- public StopCommand(String vmName, boolean executeInSequence) {
+ public StopCommand(String vmName) {
super(vmName);
- this.executeInSequence = executeInSequence;
}
public String getVnet() {
@@ -58,7 +53,7 @@ public class StopCommand extends RebootCommand {
@Override
public boolean executeInSequence() {
- return executeInSequence;
+ return true;
}
public boolean isProxy() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
b/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
index d51ea5e..fd8d84c 100644
--- a/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
+++ b/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
@@ -32,7 +32,6 @@ public class DhcpEntryCommand extends NetworkElementCommand {
String ip6Gateway;
String duid;
private boolean isDefault;
- boolean executeInSequence = false;
protected DhcpEntryCommand() {
@@ -40,20 +39,19 @@ public class DhcpEntryCommand extends NetworkElementCommand
{
@Override
public boolean executeInSequence() {
- return executeInSequence;
+ return true;
}
- public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName,
String vmIp6Address, boolean executeInSequence) {
+ public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName,
String vmIp6Address) {
this.vmMac = vmMac;
this.vmIpAddress = vmIpAddress;
this.vmName = vmName;
this.vmIp6Address = vmIp6Address;
this.setDefault(true);
- this.executeInSequence = executeInSequence;
}
- public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName,
String vmIp6Address, String dns, String gateway, String ip6Gateway, boolean
executeInSequence) {
- this(vmMac, vmIpAddress, vmName, vmIp6Address, executeInSequence);
+ public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName,
String vmIp6Address, String dns, String gateway, String ip6Gateway) {
+ this(vmMac, vmIpAddress, vmName, vmIp6Address);
this.dns = dns;
this.gateway = gateway;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java
b/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java
index c77dbf6..6dac148 100644
--- a/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java
@@ -22,21 +22,19 @@ public class SavePasswordCommand extends
NetworkElementCommand {
String password;
String vmIpAddress;
String vmName;
- boolean executeInSequence = false;
protected SavePasswordCommand() {
}
@Override
public boolean executeInSequence() {
- return executeInSequence;
+ return true;
}
- public SavePasswordCommand(String password, String vmIpAddress, String
vmName, boolean executeInSequence) {
+ public SavePasswordCommand(String password, String vmIpAddress, String
vmName) {
this.password = password;
this.vmIpAddress = vmIpAddress;
this.vmName = vmName;
- this.executeInSequence = executeInSequence;
}
public String getPassword() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/core/src/com/cloud/agent/api/routing/UserDataCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/UserDataCommand.java
b/core/src/com/cloud/agent/api/routing/UserDataCommand.java
index cf36002..f7b38c8 100644
--- a/core/src/com/cloud/agent/api/routing/UserDataCommand.java
+++ b/core/src/com/cloud/agent/api/routing/UserDataCommand.java
@@ -23,7 +23,6 @@ public class UserDataCommand extends NetworkElementCommand {
String vmIpAddress;
String routerPrivateIpAddress;
String vmName;
- boolean executeInSequence = false;
protected UserDataCommand() {
@@ -31,15 +30,14 @@ public class UserDataCommand extends NetworkElementCommand {
@Override
public boolean executeInSequence() {
- return executeInSequence;
+ return true;
}
- public UserDataCommand(String userData, String vmIpAddress, String
routerPrivateIpAddress, String vmName, boolean executeInSequence) {
+ public UserDataCommand(String userData, String vmIpAddress, String
routerPrivateIpAddress, String vmName) {
this.userData = userData;
this.vmIpAddress = vmIpAddress;
this.routerPrivateIpAddress = routerPrivateIpAddress;
this.vmName = vmName;
- this.executeInSequence = executeInSequence;
}
public String getRouterPrivateIpAddress() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/core/src/com/cloud/agent/api/routing/VmDataCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/VmDataCommand.java
b/core/src/com/cloud/agent/api/routing/VmDataCommand.java
index 861f700..df88255 100644
--- a/core/src/com/cloud/agent/api/routing/VmDataCommand.java
+++ b/core/src/com/cloud/agent/api/routing/VmDataCommand.java
@@ -28,29 +28,27 @@ public class VmDataCommand extends NetworkElementCommand {
String vmName;
@LogLevel(Log4jLevel.Trace)
List<String[]> vmData;
- boolean executeInSequence = false;
protected VmDataCommand() {
}
@Override
public boolean executeInSequence() {
- return executeInSequence;
+ return true;
}
- public VmDataCommand(String vmIpAddress, boolean executeInSequence) {
- this(vmIpAddress, null, executeInSequence);
+ public VmDataCommand(String vmIpAddress) {
+ this(vmIpAddress, null);
}
public String getVmName() {
return vmName;
}
- public VmDataCommand(String vmIpAddress, String vmName, boolean
executeInSequence) {
+ public VmDataCommand(String vmIpAddress, String vmName) {
this.vmName = vmName;
this.vmIpAddress = vmIpAddress;
this.vmData = new ArrayList<String[]>();
- this.executeInSequence = executeInSequence;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
index 1acf2cc..3d05e9b 100644
--- a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
@@ -28,24 +28,22 @@ public class CopyVolumeCommand extends Command {
String secondaryStorageURL;
boolean toSecondaryStorage;
String vmName;
- boolean executeInSequence = false;
public CopyVolumeCommand() {
}
- public CopyVolumeCommand(long volumeId, String volumePath, StoragePool
pool, String secondaryStorageURL, boolean toSecondaryStorage, int wait, boolean
executeInSequence) {
+ public CopyVolumeCommand(long volumeId, String volumePath, StoragePool
pool, String secondaryStorageURL, boolean toSecondaryStorage, int wait) {
this.volumeId = volumeId;
this.volumePath = volumePath;
this.pool = new StorageFilerTO(pool);
this.secondaryStorageURL = secondaryStorageURL;
this.toSecondaryStorage = toSecondaryStorage;
setWait(wait);
- this.executeInSequence = executeInSequence;
}
@Override
public boolean executeInSequence() {
- return executeInSequence;
+ return true;
}
public String getVolumePath() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/core/src/com/cloud/agent/api/storage/CreateCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CreateCommand.java
b/core/src/com/cloud/agent/api/storage/CreateCommand.java
index 900abfd..fd0375a 100644
--- a/core/src/com/cloud/agent/api/storage/CreateCommand.java
+++ b/core/src/com/cloud/agent/api/storage/CreateCommand.java
@@ -26,7 +26,6 @@ public class CreateCommand extends Command {
private StorageFilerTO pool;
private DiskProfile diskCharacteristics;
private String templateUrl;
- boolean executeInSequence = false;
protected CreateCommand() {
super();
@@ -34,47 +33,44 @@ public class CreateCommand extends Command {
/**
* Construction for template based volumes.
+ *
+ * @param vol
+ * @param vm
* @param diskCharacteristics
* @param templateUrl
* @param pool
- * @param executeInSequence TODO
- * @param vol
- * @param vm
*/
- public CreateCommand(DiskProfile diskCharacteristics, String templateUrl,
StorageFilerTO pool, boolean executeInSequence) {
- this(diskCharacteristics, pool, executeInSequence);
+ public CreateCommand(DiskProfile diskCharacteristics, String templateUrl,
StorageFilerTO pool) {
+ this(diskCharacteristics, pool);
this.templateUrl = templateUrl;
- this.executeInSequence = executeInSequence;
}
/**
* Construction for regular volumes.
- * @param diskCharacteristics
- * @param pool
- * @param executeInSequence TODO
+ *
* @param vol
* @param vm
+ * @param diskCharacteristics
+ * @param pool
*/
- public CreateCommand(DiskProfile diskCharacteristics, StorageFilerTO pool,
boolean executeInSequence) {
+ public CreateCommand(DiskProfile diskCharacteristics, StorageFilerTO pool)
{
this.volId = diskCharacteristics.getVolumeId();
this.diskCharacteristics = diskCharacteristics;
this.pool = pool;
this.templateUrl = null;
- this.executeInSequence = executeInSequence;
}
- public CreateCommand(DiskProfile diskCharacteristics, String templateUrl,
StoragePool pool, boolean executeInSequence) {
- this(diskCharacteristics, templateUrl, new StorageFilerTO(pool),
executeInSequence);
+ public CreateCommand(DiskProfile diskCharacteristics, String templateUrl,
StoragePool pool) {
+ this(diskCharacteristics, templateUrl, new StorageFilerTO(pool));
}
- public CreateCommand(DiskProfile diskCharacteristics, StoragePool pool,
boolean executeInSequence) {
- this(diskCharacteristics, new StorageFilerTO(pool), executeInSequence);
- this.executeInSequence = executeInSequence;
+ public CreateCommand(DiskProfile diskCharacteristics, StoragePool pool) {
+ this(diskCharacteristics, new StorageFilerTO(pool));
}
@Override
public boolean executeInSequence() {
- return executeInSequence;
+ return true;
}
public String getTemplateUrl() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
----------------------------------------------------------------------
diff --git
a/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
b/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index cb7940e..a6880c3 100644
---
a/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++
b/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -50,11 +50,11 @@ import com.cloud.agent.api.CreateVolumeFromSnapshotCommand;
import com.cloud.agent.api.UpgradeSnapshotCommand;
import com.cloud.agent.api.storage.CopyVolumeAnswer;
import com.cloud.agent.api.storage.CopyVolumeCommand;
+import com.cloud.agent.api.storage.MigrateVolumeAnswer;
+import com.cloud.agent.api.storage.MigrateVolumeCommand;
import com.cloud.agent.api.storage.CreateAnswer;
import com.cloud.agent.api.storage.CreateCommand;
import com.cloud.agent.api.storage.CreatePrivateTemplateAnswer;
-import com.cloud.agent.api.storage.MigrateVolumeAnswer;
-import com.cloud.agent.api.storage.MigrateVolumeCommand;
import com.cloud.agent.api.to.S3TO;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.SwiftTO;
@@ -67,7 +67,6 @@ import com.cloud.exception.StorageUnavailableException;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
-import com.cloud.server.ManagementServer;
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.SnapshotVO;
import com.cloud.storage.Storage.ImageFormat;
@@ -139,11 +138,6 @@ public class AncientDataMotionStrategy implements
DataMotionStrategy {
private SwiftManager _swiftMgr;
@Inject
private S3Manager _s3Mgr;
- @Inject
- private ManagementServer _mgmtServer;
-
- protected boolean _executeInSequence;
-
@Override
public boolean canHandle(DataObject srcData, DataObject destData) {
@@ -171,7 +165,7 @@ public class AncientDataMotionStrategy implements
DataMotionStrategy {
StoragePool destPool = (StoragePool) destData.getDataStore();
CopyVolumeCommand cvCmd = new CopyVolumeCommand(srcData.getId(),
volumeUUID, destPool, secondaryStorageURL, false,
- _copyvolumewait, _mgmtServer.getExecuteInSequence());
+ _copyvolumewait);
CopyVolumeAnswer cvAnswer = null;
String errMsg = null;
try {
@@ -327,7 +321,7 @@ public class AncientDataMotionStrategy implements
DataMotionStrategy {
null);
CreateCommand cmd = new CreateCommand(diskProfile,
tmpltStoredOn.getLocalDownloadPath(),
- new StorageFilerTO((StoragePool)template.getDataStore()),
_mgmtServer.getExecuteInSequence());
+ new StorageFilerTO((StoragePool)template.getDataStore()));
Answer answer = null;
StoragePool pool = (StoragePool)volume.getDataStore();
String errMsg = null;
@@ -381,7 +375,7 @@ public class AncientDataMotionStrategy implements
DataMotionStrategy {
Integer.parseInt(Config.CopyVolumeWait.getDefaultValue()));
CopyVolumeCommand cvCmd = new CopyVolumeCommand(volume.getId(),
volume.getPath(), srcPool, secondaryStorageURL, true,
- _copyvolumewait, _mgmtServer.getExecuteInSequence());
+ _copyvolumewait);
CopyVolumeAnswer cvAnswer;
try {
cvAnswer = (CopyVolumeAnswer) this.storageMgr.sendToPool(srcPool,
cvCmd);
@@ -400,7 +394,7 @@ public class AncientDataMotionStrategy implements
DataMotionStrategy {
cvCmd = new CopyVolumeCommand(volume.getId(),
secondaryStorageVolumePath, destPool,
- secondaryStorageURL, false, _copyvolumewait,
_mgmtServer.getExecuteInSequence());
+ secondaryStorageURL, false, _copyvolumewait);
try {
cvAnswer = (CopyVolumeAnswer) this.storageMgr.sendToPool(destPool,
cvCmd);
} catch (StorageUnavailableException e1) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/patches/systemvm/debian/config/root/edithosts.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/edithosts.sh
b/patches/systemvm/debian/config/root/edithosts.sh
index eaa8292..fb0c34f 100755
--- a/patches/systemvm/debian/config/root/edithosts.sh
+++ b/patches/systemvm/debian/config/root/edithosts.sh
@@ -69,9 +69,7 @@ HOSTS=/etc/hosts
source /root/func.sh
lock="biglock"
-#default timeout value is 30 mins as DhcpEntryCommand is not synchronized on
agent side any more,
-#and multiple commands can be sent to the same VR at a time
-locked=$(getLockFile $lock 1800)
+locked=$(getLockFile $lock)
if [ "$locked" != "1" ]
then
exit 1
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/patches/systemvm/debian/config/root/savepassword.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/savepassword.sh
b/patches/systemvm/debian/config/root/savepassword.sh
index fc73603..a096b86 100755
--- a/patches/systemvm/debian/config/root/savepassword.sh
+++ b/patches/systemvm/debian/config/root/savepassword.sh
@@ -25,9 +25,7 @@
source /root/func.sh
lock="passwdlock"
-#default timeout value is 30 mins as password reset command is not
synchronized on agent side any more,
-#and multiple commands can be sent to the same VR at a time
-locked=$(getLockFile $lock 1800)
+locked=$(getLockFile $lock)
if [ "$locked" != "1" ]
then
exit 1
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/patches/systemvm/debian/config/root/userdata.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/userdata.sh
b/patches/systemvm/debian/config/root/userdata.sh
index f9ea644..e5d170b 100644
--- a/patches/systemvm/debian/config/root/userdata.sh
+++ b/patches/systemvm/debian/config/root/userdata.sh
@@ -21,9 +21,7 @@
source /root/func.sh
lock="biglock"
-#default timeout value is 30 mins as userdata command is not synchronized on
agent side any more,
-#and multiple commands can be sent to the same VR at a time
-locked=$(getLockFile $lock 1800)
+locked=$(getLockFile $lock)
if [ "$locked" != "1" ]
then
exit 1
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java
index c749211..f87bf71 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java
@@ -53,7 +53,6 @@ import com.cloud.host.Host.Type;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.network.Network;
-import com.cloud.network.NetworkModel;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.dao.PhysicalNetworkDao;
import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
@@ -101,8 +100,6 @@ public class BaremetalDhcpManagerImpl extends ManagerBase
implements BaremetalDh
PhysicalNetworkServiceProviderDao _physicalNetworkServiceProviderDao;
@Inject
BaremetalDhcpDao _extDhcpDao;
- @Inject
- NetworkModel _ntwkModel;
@Override
public boolean configure(String name, Map<String, Object> params) throws
ConfigurationException {
@@ -150,7 +147,7 @@ public class BaremetalDhcpManagerImpl extends ManagerBase
implements BaremetalDh
dns = nic.getDns2();
}
DhcpEntryCommand dhcpCommand = new
DhcpEntryCommand(nic.getMacAddress(), nic.getIp4Address(),
profile.getVirtualMachine().getHostName(), null, dns,
- nic.getGateway(), null,
_ntwkModel.getExecuteInSeqNtwkElmtCmd());
+ nic.getGateway(), null);
String errMsg = String.format("Set dhcp entry on external DHCP %1$s
failed(ip=%2$s, mac=%3$s, vmname=%4$s)", h.getPrivateIpAddress(),
nic.getIp4Address(), nic.getMacAddress(),
profile.getVirtualMachine().getHostName());
// prepareBareMetalDhcpEntry(nic, dhcpCommand);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
index 04f5fbc..59a2811 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
@@ -45,7 +45,6 @@ import com.cloud.deploy.DeployDestination;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
-import com.cloud.network.NetworkModel;
import com.cloud.network.dao.PhysicalNetworkDao;
import com.cloud.network.dao.PhysicalNetworkVO;
import com.cloud.resource.ResourceManager;
@@ -82,7 +81,6 @@ public class BaremetalPxeManagerImpl extends ManagerBase
implements BaremetalPxe
@Inject NicDao _nicDao;
@Inject ConfigurationDao _configDao;
@Inject PhysicalNetworkDao _phynwDao;
- @Inject NetworkModel _ntwkModel;
@Override
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
@@ -186,7 +184,7 @@ public class BaremetalPxeManagerImpl extends ManagerBase
implements BaremetalPxe
String serviceOffering =
_serviceOfferingDao.findByIdIncludingRemoved(vm.getServiceOfferingId()).getDisplayText();
String zoneName = _dcDao.findById(vm.getDataCenterId()).getName();
NicVO nvo = _nicDao.findById(nic.getId());
- VmDataCommand cmd = new VmDataCommand(nvo.getIp4Address(),
vm.getInstanceName(), _ntwkModel.getExecuteInSeqNtwkElmtCmd());
+ VmDataCommand cmd = new VmDataCommand(nvo.getIp4Address(),
vm.getInstanceName());
cmd.addVmData("userdata", "user-data", vm.getUserData());
cmd.addVmData("metadata", "service-offering",
StringUtils.unicodeEscape(serviceOffering));
cmd.addVmData("metadata", "availability-zone",
StringUtils.unicodeEscape(zoneName));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
----------------------------------------------------------------------
diff --git
a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
index fa099d3..0486902 100644
---
a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
+++
b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
@@ -49,12 +49,11 @@ import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.exception.StorageUnavailableException;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
-import com.cloud.server.ManagementServer;
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.ResizeVolumePayload;
-import com.cloud.storage.SnapshotVO;
import com.cloud.storage.Storage;
import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.storage.SnapshotVO;
import com.cloud.storage.StorageManager;
import com.cloud.storage.StoragePool;
import com.cloud.storage.VMTemplateHostVO;
@@ -86,7 +85,6 @@ public class CloudStackPrimaryDataStoreDriverImpl implements
PrimaryDataStoreDri
@Inject SnapshotDao snapshotDao;
@Inject PrimaryDataStoreDao primaryStoreDao;
@Inject SnapshotManager snapshotMgr;
- @Inject ManagementServer _mgmtSrvr;
@Override
public String grantAccess(DataObject data, EndPoint ep) {
// TODO Auto-generated method stub
@@ -154,7 +152,7 @@ public class CloudStackPrimaryDataStoreDriverImpl
implements PrimaryDataStoreDri
String fullTmpltUrl =
tmpltHostUrl + "/"
+
tmpltHostOn.getInstallPath();
cmd = new
CreateCommand(diskProfile, fullTmpltUrl,
- new
StorageFilerTO(pool), _mgmtSrvr.getExecuteInSequence());
+ new
StorageFilerTO(pool));
} else {
tmpltStoredOn =
templateMgr.prepareTemplateForCreate(
template, pool);
@@ -168,7 +166,7 @@ public class CloudStackPrimaryDataStoreDriverImpl
implements PrimaryDataStoreDri
}
cmd = new
CreateCommand(diskProfile,
tmpltStoredOn.getLocalDownloadPath(),
- new
StorageFilerTO(pool), _mgmtSrvr.getExecuteInSequence());
+ new
StorageFilerTO(pool));
}
} else {
if (template != null
@@ -182,7 +180,7 @@ public class CloudStackPrimaryDataStoreDriverImpl
implements PrimaryDataStoreDri
}
}
cmd = new CreateCommand(diskProfile,
new StorageFilerTO(
- pool),
_mgmtSrvr.getExecuteInSequence());
+ pool));
}
Answer answer = storageMgr.sendToPool(pool,
null, cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java
b/server/src/com/cloud/configuration/Config.java
index 2b0ffaf..e219077 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -422,11 +422,8 @@ public enum Config {
BlacklistedRoutes("Advanced", VpcManager.class, String.class,
"blacklisted.routes", null, "Routes that are blacklisted, can not be used for
Static Routes creation for the VPC Private Gateway",
"routes", ConfigurationParameterScope.zone.toString()),
- InternalLbVmServiceOfferingId("Advanced", ManagementServer.class,
String.class, "internallbvm.service.offering", null, "Uuid of the service
offering used by internal lb vm; if NULL - default system internal lb offering
will be used", null),
- ExecuteInSequence("Advanced", ManagementServer.class, Boolean.class,
"execute.in.sequence.hypervisor.commands", "false", "If set to true,
StartCommand, StopCommand, CopyVolumeCommand, CreateCommand will be
synchronized on the agent side." +
- " If set to false, these commands become asynchronous. Default
value is false.", null),
- ExecuteInSequenceNetworkElementCommands("Advanced", NetworkManager.class,
Boolean.class, "execute.in.sequence.network.element.commands", "false", "If set
to true, DhcpEntryCommand, SavePasswordCommand, UserDataCommand, VmDataCommand
will be synchronized on the agent side." +
- " If set to false, these commands become asynchronous. Default
value is false.", null);
+ InternalLbVmServiceOfferingId("Advanced", ManagementServer.class,
String.class, "internallbvm.service.offering", null, "Uuid of the service
offering used by internal lb vm; if NULL - default system internal lb offering
will be used", null);
+
private final String _category;
private final Class<?> _componentClass;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/server/src/com/cloud/network/NetworkManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManager.java
b/server/src/com/cloud/network/NetworkManager.java
index 306169e..bc43daa 100755
--- a/server/src/com/cloud/network/NetworkManager.java
+++ b/server/src/com/cloud/network/NetworkManager.java
@@ -386,5 +386,4 @@ public interface NetworkManager {
DhcpServiceProvider getDhcpServiceProvider(Network network);
PublicIp assignPublicIpAddressFromVlans(long dcId, Long podId, Account
owner, VlanType type, List<Long> vlanDbIds, Long networkId, String requestedIp,
boolean isSystem) throws InsufficientAddressCapacityException;
-
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java
b/server/src/com/cloud/network/NetworkManagerImpl.java
index 41054ec..eef5d76 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1234,7 +1234,7 @@ public class NetworkManagerImpl extends ManagerBase
implements NetworkManager, L
_configs = _configDao.getConfiguration("AgentManager", params);
_networkGcWait =
NumbersUtil.parseInt(_configs.get(Config.NetworkGcWait.key()), 600);
_networkGcInterval =
NumbersUtil.parseInt(_configs.get(Config.NetworkGcInterval.key()), 600);
-
+
_configs = _configDao.getConfiguration("Network", params);
_networkLockTimeout =
NumbersUtil.parseInt(_configs.get(Config.NetworkLockTimeout.key()), 600);
@@ -4379,5 +4379,5 @@ public class NetworkManagerImpl extends ManagerBase
implements NetworkManager, L
nic.setVmType(vmType);
return _nicDao.persist(nic);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java
b/server/src/com/cloud/network/NetworkModelImpl.java
index 4a4da8e..fa34d65 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -208,16 +208,11 @@ public class NetworkModelImpl extends ManagerBase
implements NetworkModel {
private boolean _allowSubdomainNetworkAccess;
private Map<String, String> _configs;
-
- protected boolean _executeInSequenceNtwkElmtCmd;
HashMap<Long, Long> _lastNetworkIdsToFree = new HashMap<Long, Long>();
static HashMap<Service, List<Provider>> s_serviceToImplementedProvidersMap
= new HashMap<Service, List<Provider>>();
static HashMap<String, String> s_providerToNetworkElementMap = new
HashMap<String, String>();
-
-
-
/**
*
*/
@@ -1874,7 +1869,6 @@ public class NetworkModelImpl extends ManagerBase
implements NetworkModel {
_configs = _configDao.getConfiguration("Network", params);
_networkDomain = _configs.get(Config.GuestDomainSuffix.key());
_allowSubdomainNetworkAccess =
Boolean.valueOf(_configs.get(Config.SubDomainNetworkAccess.key()));
- _executeInSequenceNtwkElmtCmd =
Boolean.valueOf(_configs.get(Config.ExecuteInSequenceNetworkElementCommands.key()));
NetworkOfferingVO publicNetworkOffering = new
NetworkOfferingVO(NetworkOfferingVO.SystemPublicNetwork, TrafficType.Public,
true);
publicNetworkOffering =
_networkOfferingDao.persistDefaultNetworkOffering(publicNetworkOffering);
@@ -2118,9 +2112,4 @@ public class NetworkModelImpl extends ManagerBase
implements NetworkModel {
public Networks.IsolationType[] listNetworkIsolationMethods() {
return Networks.IsolationType.values();
}
-
- @Override
- public boolean getExecuteInSeqNtwkElmtCmd() {
- return _executeInSequenceNtwkElmtCmd;
- }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
index bdd8e61..320258b 100644
--- a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
+++ b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
@@ -152,7 +152,7 @@ public class CloudZonesNetworkElement extends AdapterBase
implements NetworkElem
private VmDataCommand generateVmDataCommand(String vmPrivateIpAddress,
String userData, String serviceOffering, String zoneName, String
guestIpAddress, String vmName, String vmInstanceName, long vmId, String vmUuid,
String publicKey) {
- VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName,
_networkMgr.getExecuteInSeqNtwkElmtCmd());
+ VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName);
cmd.addVmData("userdata", "user-data", userData);
cmd.addVmData("metadata", "service-offering", serviceOffering);
@@ -217,7 +217,7 @@ public class CloudZonesNetworkElement extends AdapterBase
implements NetworkElem
Commands cmds = new Commands(OnError.Continue);
if (password != null && nic.isDefaultNic()) {
final String encodedPassword =
PasswordGenerator.rot13(password);
- SavePasswordCommand cmd = new
SavePasswordCommand(encodedPassword, nic.getIp4Address(),
uservm.getVirtualMachine().getHostName(),
_networkMgr.getExecuteInSeqNtwkElmtCmd());
+ SavePasswordCommand cmd = new
SavePasswordCommand(encodedPassword, nic.getIp4Address(),
uservm.getVirtualMachine().getHostName());
cmds.addCommand("password", cmd);
}
String serviceOffering =
_serviceOfferingDao.findByIdIncludingRemoved(uservm.getServiceOfferingId()).getDisplayText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index b07b6f8..4b29eab 100755
---
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -167,7 +167,6 @@ import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.resource.ResourceManager;
import com.cloud.server.ConfigurationServer;
-import com.cloud.server.ManagementServer;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.GuestOSVO;
@@ -799,7 +798,7 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
private VmDataCommand generateVmDataCommand(VirtualRouter router, String
vmPrivateIpAddress, String userData,
String serviceOffering, String zoneName, String guestIpAddress,
String vmName,
String vmInstanceName, long vmId, String vmUuid, String publicKey,
long guestNetworkId) {
- VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName,
_networkModel.getExecuteInSeqNtwkElmtCmd());
+ VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName);
cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP,
getRouterControlIp(router.getId()));
cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP,
getRouterIpInNetwork(guestNetworkId, router.getId()));
@@ -3361,7 +3360,7 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
if (router.getIsRedundantRouter() && router.getRedundantState() !=
RedundantState.MASTER) {
encodedPassword = PasswordGenerator.rot13("saved_password");
}
- SavePasswordCommand cmd = new SavePasswordCommand(encodedPassword,
nic.getIp4Address(), profile.getVirtualMachine().getHostName(),
_networkModel.getExecuteInSeqNtwkElmtCmd());
+ SavePasswordCommand cmd = new SavePasswordCommand(encodedPassword,
nic.getIp4Address(), profile.getVirtualMachine().getHostName());
cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP,
getRouterControlIp(router.getId()));
cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP,
getRouterIpInNetwork(nic.getNetworkId(), router.getId()));
cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME,
router.getInstanceName());
@@ -3401,7 +3400,7 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
}
private void createDhcpEntryCommand(VirtualRouter router, UserVm vm, NicVO
nic, Commands cmds) {
- DhcpEntryCommand dhcpCommand = new
DhcpEntryCommand(nic.getMacAddress(), nic.getIp4Address(), vm.getHostName(),
nic.getIp6Address(), _networkModel.getExecuteInSeqNtwkElmtCmd());
+ DhcpEntryCommand dhcpCommand = new
DhcpEntryCommand(nic.getMacAddress(), nic.getIp4Address(), vm.getHostName(),
nic.getIp6Address());
DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
Nic defaultNic = findGatewayIp(vm.getId());
String gatewayIp = defaultNic.getGateway();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/server/src/com/cloud/server/ManagementServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServer.java
b/server/src/com/cloud/server/ManagementServer.java
index aec1be7..f60ce48 100755
--- a/server/src/com/cloud/server/ManagementServer.java
+++ b/server/src/com/cloud/server/ManagementServer.java
@@ -72,6 +72,4 @@ public interface ManagementServer extends ManagementService,
PluggableService {
String getEncryptionIV();
void resetEncryptionKeyIV();
- boolean getExecuteInSequence();
-
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java
b/server/src/com/cloud/server/ManagementServerImpl.java
index cfc8333..dea761d 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -766,8 +766,6 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
ConfigurationServer _configServer;
@Inject
UserVmManager _userVmMgr;
- @Inject ClusterManager _clusterMgr;
-
private final ScheduledExecutorService _eventExecutor =
Executors.newScheduledThreadPool(1, new NamedThreadFactory("EventChecker"));
private final ScheduledExecutorService _alertExecutor =
Executors.newScheduledThreadPool(1, new NamedThreadFactory("AlertChecker"));
@@ -790,10 +788,10 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
this._planners = _planners;
}
+ @Inject ClusterManager _clusterMgr;
private String _hashKey = null;
private String _encryptionKey = null;
private String _encryptionIV = null;
- protected boolean _executeInSequence;
@Inject
protected AffinityGroupVMMapDao _affinityGroupVMMapDao;
@@ -863,8 +861,6 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
_availableIdsMap.put(id, true);
}
- _executeInSequence =
Boolean.parseBoolean(_configDao.getValue(Config.ExecuteInSequence.key()));
-
return true;
}
@@ -3473,7 +3469,7 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
String value = _configs.get(Config.CopyVolumeWait.toString());
int copyvolumewait = NumbersUtil.parseInt(value,
Integer.parseInt(Config.CopyVolumeWait.getDefaultValue()));
// Copy the volume from the source storage pool to secondary
storage
- CopyVolumeCommand cvCmd = new CopyVolumeCommand(volume.getId(),
volume.getPath(), srcPool, secondaryStorageURL, true, copyvolumewait,
_executeInSequence);
+ CopyVolumeCommand cvCmd = new CopyVolumeCommand(volume.getId(),
volume.getPath(), srcPool, secondaryStorageURL, true, copyvolumewait);
CopyVolumeAnswer cvAnswer = null;
try {
cvAnswer = (CopyVolumeAnswer) _storageMgr.sendToPool(srcPool,
cvCmd);
@@ -4084,9 +4080,5 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
return plannersAvailable;
}
-
- @Override
- public boolean getExecuteInSequence() {
- return _executeInSequence;
- }
+
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 5814075..f946cd1 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -130,7 +130,6 @@ import com.cloud.offering.ServiceOffering;
import com.cloud.org.Cluster;
import com.cloud.resource.ResourceManager;
import com.cloud.server.ConfigurationServer;
-import com.cloud.server.ManagementServer;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.DiskOfferingVO;
@@ -260,8 +259,6 @@ public class VirtualMachineManagerImpl extends ManagerBase
implements VirtualMac
protected AffinityGroupVMMapDao _affinityGroupVMMapDao;
@Inject
protected ConfigurationServer _configServer;
- @Inject
- protected ManagementServer _mgmtServer;
protected List<DeploymentPlanner> _planners;
public List<DeploymentPlanner> getPlanners() {
@@ -860,7 +857,7 @@ public class VirtualMachineManagerImpl extends ManagerBase
implements VirtualMac
VirtualMachineTO vmTO = hvGuru.implement(vmProfile);
cmds = new Commands(OnError.Stop);
- cmds.addCommand(new StartCommand(vmTO, dest.getHost(),
_mgmtServer.getExecuteInSequence()));
+ cmds.addCommand(new StartCommand(vmTO, dest.getHost()));
vmGuru.finalizeDeployment(cmds, vmProfile, dest, ctx);
@@ -900,7 +897,7 @@ public class VirtualMachineManagerImpl extends ManagerBase
implements VirtualMac
s_logger.info("The guru did not like the
answers so stopping " + vm);
}
- StopCommand cmd = new StopCommand(vm,
_mgmtServer.getExecuteInSequence());
+ StopCommand cmd = new StopCommand(vm);
StopAnswer answer = (StopAnswer)
_agentMgr.easySend(destHostId, cmd);
if (answer == null || !answer.getResult()) {
s_logger.warn("Unable to stop " + vm + " due
to " + (answer != null ? answer.getDetails() : "no answers"));
@@ -987,7 +984,7 @@ public class VirtualMachineManagerImpl extends ManagerBase
implements VirtualMac
protected <T extends VMInstanceVO> boolean sendStop(VirtualMachineGuru<T>
guru, VirtualMachineProfile<T> profile, boolean force) {
VMInstanceVO vm = profile.getVirtualMachine();
- StopCommand stop = new StopCommand(vm,
_mgmtServer.getExecuteInSequence());
+ StopCommand stop = new StopCommand(vm);
try {
Answer answer = _agentMgr.send(vm.getHostId(), stop);
if (!answer.getResult()) {
@@ -1173,7 +1170,7 @@ public class VirtualMachineManagerImpl extends
ManagerBase implements VirtualMac
vmGuru.prepareStop(profile);
- StopCommand stop = new StopCommand(vm,
_mgmtServer.getExecuteInSequence());
+ StopCommand stop = new StopCommand(vm);
boolean stopped = false;
StopAnswer answer = null;
try {
@@ -1926,11 +1923,11 @@ public class VirtualMachineManagerImpl extends
ManagerBase implements VirtualMac
}
public Command cleanup(VirtualMachine vm) {
- return new StopCommand(vm, _mgmtServer.getExecuteInSequence());
+ return new StopCommand(vm);
}
public Command cleanup(String vmName) {
- return new StopCommand(vmName, _mgmtServer.getExecuteInSequence());
+ return new StopCommand(vmName);
}
public Commands fullHostSync(final long hostId, StartupRoutingCommand
startup) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/server/test/com/cloud/network/MockNetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java
b/server/test/com/cloud/network/MockNetworkModelImpl.java
index bab9df8..3a36748 100644
--- a/server/test/com/cloud/network/MockNetworkModelImpl.java
+++ b/server/test/com/cloud/network/MockNetworkModelImpl.java
@@ -879,10 +879,4 @@ public class MockNetworkModelImpl extends ManagerBase
implements NetworkModel {
public Nic getNicInNetworkIncludingRemoved(long vmId, long networkId) {
return null;
}
-
- @Override
- public boolean getExecuteInSeqNtwkElmtCmd() {
- // TODO Auto-generated method stub
- return false;
- }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/server/test/com/cloud/vpc/MockNetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockNetworkModelImpl.java
b/server/test/com/cloud/vpc/MockNetworkModelImpl.java
index a6ab126..3e67f5e 100644
--- a/server/test/com/cloud/vpc/MockNetworkModelImpl.java
+++ b/server/test/com/cloud/vpc/MockNetworkModelImpl.java
@@ -892,10 +892,4 @@ public class MockNetworkModelImpl extends ManagerBase
implements NetworkModel {
return null;
}
- @Override
- public boolean getExecuteInSeqNtwkElmtCmd() {
- // TODO Auto-generated method stub
- return false;
- }
-
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0035bbba/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 9d80b3b..9e14dbb 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -1854,7 +1854,6 @@ UPDATE `cloud`.`networks` set name='Shared SG enabled
network', display_text='Sh
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'use.system.public.ips', 'true', 'If true, when account
has dedicated public ip range(s), once the ips dedicated to the account have
been consumed ips will be acquired from the system pool');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'use.system.guest.vlans', 'true', 'If true, when account
has dedicated guest vlan range(s), once the vlans dedicated to the account have
been consumed vlans will be allocated from the system pool');
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'execute.in.sequence.hypervisor.commands', 'false', 'If
set to true, StartCommand, StopCommand, CopyVolumeCommand, CreateCommand will
be synchronized on the agent side. If set to false, these commands become
asynchronous. Default value is false.');
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'execute.in.sequence.network.element.commands', 'false',
'If set to true, DhcpEntryCommand, SavePasswordCommand, UserDataCommand,
VmDataCommand will be synchronized on the agent side. If set to false, these
commands become asynchronous. Default value is false.');
alter table `cloud`.`network_offerings` add column egress_default_policy
boolean default false;
+
