cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [5/6] git commit: updated refs/heads/master to d8c038e
Date Fri, 25 Nov 2016 07:41:23 GMT
Merge branch '4.8' into 4.9


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

Branch: refs/heads/master
Commit: 50f80cc2a0e1a26f23bedb044b0d6824201828ca
Parents: e59897b 5811d33
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Fri Nov 25 13:03:04 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri Nov 25 13:03:04 2016 +0530

----------------------------------------------------------------------
 engine/api/src/com/cloud/vm/VirtualMachineManager.java  |  2 ++
 .../engine/cloud/entity/api/VirtualMachineEntity.java   |  6 ++++++
 .../src/com/cloud/vm/VirtualMachineManagerImpl.java     | 12 ++++++++++++
 .../engine/cloud/entity/api/VMEntityManager.java        |  2 ++
 .../engine/cloud/entity/api/VMEntityManagerImpl.java    |  6 ++++++
 .../cloud/entity/api/VirtualMachineEntityImpl.java      |  5 +++++
 .../networkservice/BaremetalPxeManagerImpl.java         |  2 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java          |  7 ++++++-
 8 files changed, 40 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50f80cc2/engine/api/src/com/cloud/vm/VirtualMachineManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50f80cc2/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --cc engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 9523b92,18c2beb..2ddf8c2
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@@ -1239,13 -1239,25 +1239,25 @@@ public class VirtualMachineManagerImpl 
          } catch (final ConcurrentOperationException e) {
              throw new CloudRuntimeException("Unable to stop vm because of a concurrent operation",
e);
          }
+ 
+     }
+ 
+     @Override
+     public void stopForced(String vmUuid) throws ResourceUnavailableException {
+         try {
+             advanceStop(vmUuid, true);
+         } catch (final OperationTimedoutException e) {
+             throw new AgentUnavailableException("Unable to stop vm because the operation
to stop timed out", e.getAgentId(), e);
+         } catch (final ConcurrentOperationException e) {
+             throw new CloudRuntimeException("Unable to stop vm because of a concurrent operation",
e);
+         }
      }
  
 -
 -    protected boolean getExecuteInSequence(final HypervisorType hypervisorType) {
 -        if (HypervisorType.KVM == hypervisorType || HypervisorType.LXC == hypervisorType
|| HypervisorType.XenServer == hypervisorType) {
 +    @Override
 +    public boolean getExecuteInSequence(final HypervisorType hypervisorType) {
 +        if (HypervisorType.KVM == hypervisorType || HypervisorType.XenServer == hypervisorType
|| HypervisorType.Hyperv == hypervisorType || HypervisorType.LXC == hypervisorType) {
              return false;
 -        } else if(HypervisorType.VMware == hypervisorType) {
 +        } else if (HypervisorType.VMware == hypervisorType) {
              final Boolean fullClone = HypervisorGuru.VmwareFullClone.value();
              return fullClone;
          } else {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50f80cc2/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------


Mime
View raw message