From b0b16675fafd95678c95c303bc2e451855dc350d Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 27 Sep 2010 12:01:26 -0700 Subject: [PATCH] Reverted relaxed serialization for start/create commands as stress test didn't pass for non-serialized version of the commands. --- core/src/com/cloud/agent/api/SnapshotCommand.java | 2 +- core/src/com/cloud/agent/api/StartCommand.java | 3 +-- core/src/com/cloud/agent/api/StartConsoleProxyCommand.java | 5 ++--- core/src/com/cloud/agent/api/StartRouterCommand.java | 3 +-- core/src/com/cloud/agent/api/StartSecStorageVmCommand.java | 5 ++--- core/src/com/cloud/agent/api/StopCommand.java | 3 +-- core/src/com/cloud/agent/api/storage/CreateCommand.java | 3 +-- core/src/com/cloud/agent/api/storage/DestroyCommand.java | 3 +-- .../agent/api/storage/PrimaryStorageDownloadCommand.java | 1 - 9 files changed, 10 insertions(+), 18 deletions(-) diff --git a/core/src/com/cloud/agent/api/SnapshotCommand.java b/core/src/com/cloud/agent/api/SnapshotCommand.java index d9ea71546ed..e967d0b8eb6 100644 --- a/core/src/com/cloud/agent/api/SnapshotCommand.java +++ b/core/src/com/cloud/agent/api/SnapshotCommand.java @@ -97,7 +97,7 @@ public class SnapshotCommand extends Command { */ @Override public boolean executeInSequence() { - return true; + return false; } } \ No newline at end of file diff --git a/core/src/com/cloud/agent/api/StartCommand.java b/core/src/com/cloud/agent/api/StartCommand.java index 4ff5821c253..966cc33e537 100755 --- a/core/src/com/cloud/agent/api/StartCommand.java +++ b/core/src/com/cloud/agent/api/StartCommand.java @@ -106,8 +106,7 @@ public class StartCommand extends AbstractStartCommand { @Override public boolean executeInSequence() { - //Temporary relaxing serialization - return false; + return true; } public int getCpu() { diff --git a/core/src/com/cloud/agent/api/StartConsoleProxyCommand.java b/core/src/com/cloud/agent/api/StartConsoleProxyCommand.java index 65de5a89f96..0cde740e176 100644 --- a/core/src/com/cloud/agent/api/StartConsoleProxyCommand.java +++ b/core/src/com/cloud/agent/api/StartConsoleProxyCommand.java @@ -54,9 +54,8 @@ public class StartConsoleProxyCommand extends AbstractStartCommand { } @Override - public boolean executeInSequence() { - //Temporary relaxing serialization - return false; + public boolean executeInSequence() { + return true; } public ConsoleProxyVO getProxy() { diff --git a/core/src/com/cloud/agent/api/StartRouterCommand.java b/core/src/com/cloud/agent/api/StartRouterCommand.java index 166bb386bd2..913745273ca 100755 --- a/core/src/com/cloud/agent/api/StartRouterCommand.java +++ b/core/src/com/cloud/agent/api/StartRouterCommand.java @@ -37,8 +37,7 @@ public class StartRouterCommand extends AbstractStartCommand { @Override public boolean executeInSequence() { - //Temporary relaxing serialization - return false; + return true; } public StartRouterCommand(DomainRouterVO router, int networkRateMbps, int networkRateMulticastMbps, diff --git a/core/src/com/cloud/agent/api/StartSecStorageVmCommand.java b/core/src/com/cloud/agent/api/StartSecStorageVmCommand.java index 89cf5d3013b..40adcf73a47 100644 --- a/core/src/com/cloud/agent/api/StartSecStorageVmCommand.java +++ b/core/src/com/cloud/agent/api/StartSecStorageVmCommand.java @@ -53,9 +53,8 @@ public class StartSecStorageVmCommand extends AbstractStartCommand { } @Override - public boolean executeInSequence() { - //Temporary relaxing serialization - return false; + public boolean executeInSequence() { + return true; } public SecondaryStorageVmVO getSecondaryStorageVmVO() { diff --git a/core/src/com/cloud/agent/api/StopCommand.java b/core/src/com/cloud/agent/api/StopCommand.java index 533abfa9283..4d8274f778a 100755 --- a/core/src/com/cloud/agent/api/StopCommand.java +++ b/core/src/com/cloud/agent/api/StopCommand.java @@ -59,8 +59,7 @@ public class StopCommand extends RebootCommand { @Override public boolean executeInSequence() { - //Temporary relaxing serialization - return false; + return true; } public boolean isMirroredVolumes() { diff --git a/core/src/com/cloud/agent/api/storage/CreateCommand.java b/core/src/com/cloud/agent/api/storage/CreateCommand.java index af0340b1206..b3ff5f6c312 100644 --- a/core/src/com/cloud/agent/api/storage/CreateCommand.java +++ b/core/src/com/cloud/agent/api/storage/CreateCommand.java @@ -65,8 +65,7 @@ public class CreateCommand extends Command { @Override public boolean executeInSequence() { - //Temporary relaxing serialization - return false; + return true; } public String getTemplateUrl() { diff --git a/core/src/com/cloud/agent/api/storage/DestroyCommand.java b/core/src/com/cloud/agent/api/storage/DestroyCommand.java index c185b3095ef..fe8f9eeebfc 100755 --- a/core/src/com/cloud/agent/api/storage/DestroyCommand.java +++ b/core/src/com/cloud/agent/api/storage/DestroyCommand.java @@ -42,7 +42,6 @@ public class DestroyCommand extends StorageCommand { @Override public boolean executeInSequence() { - //Temporary relaxing serialization - return false; + return true; } } diff --git a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java index c54da19a030..a9010d5782e 100644 --- a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java +++ b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java @@ -56,7 +56,6 @@ public class PrimaryStorageDownloadCommand extends AbstractDownloadCommand { @Override public boolean executeInSequence() { - //Temporary relaxing serialization return true; } }