You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/12/07 08:14:35 UTC

[08/17] git commit: updated refs/heads/master to f30fbe9

Revert "CLOUDSTACK-8964 side effect isolation"

This reverts commit fc18d1e8b11c82a18854234b0c8c827896a5b78d.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e0501be8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e0501be8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e0501be8

Branch: refs/heads/master
Commit: e0501be87ea3a171afba03086139355bb3dc6051
Parents: 4f6ff6c
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Fri Dec 4 18:18:15 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Dec 4 18:18:15 2015 +0100

----------------------------------------------------------------------
 .../hypervisor/ovm3/resources/Ovm3HypervisorGuru.java     | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0501be8/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
index 3711bbf..5a2e39b 100755
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
@@ -87,15 +87,6 @@ public class Ovm3HypervisorGuru extends HypervisorGuruBase implements Hypervisor
      */
     public Pair<Boolean, Long> getCommandHostDelegation(long hostId, Command cmd) {
         LOGGER.debug("getCommandHostDelegation: " + cmd.getClass());
-        performSideEffectsForDelegationOnCommand(hostId, cmd);
-        return new Pair<Boolean, Long>(Boolean.FALSE, Long.valueOf(hostId));
-    }
-
-    /**
-     * @param hostId
-     * @param cmd
-     */
-    void performSideEffectsForDelegationOnCommand(long hostId, Command cmd) {
         if (cmd instanceof StorageSubSystemCommand) {
             StorageSubSystemCommand c = (StorageSubSystemCommand)cmd;
             c.setExecuteInSequence(true);
@@ -117,5 +108,6 @@ public class Ovm3HypervisorGuru extends HypervisorGuruBase implements Hypervisor
                 }
             }
         }
+        return new Pair<Boolean, Long>(Boolean.FALSE, Long.valueOf(hostId));
     }
 }