You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2014/11/08 09:29:56 UTC
[1/3] git commit: updated refs/heads/4.5 to 54ec268
Repository: cloudstack
Updated Branches:
refs/heads/4.5 e6907ed8d -> 54ec268b7
CLOUDSTACK-7421
Unnecessary exception in MS logs while removing default NIC from VM. Following changes are made:
1. Changed the exception from CloudRuntimeException to InvalidParameterValueExecption.
2. Moved out validation logic to UserVMManagerImpl from VirtualMachineManagerImpl.
3. Handling InvalidParameterValueException from async API calls so that they are not logged as ERROR in MS logs.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e25de54b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e25de54b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e25de54b
Branch: refs/heads/4.5
Commit: e25de54b4c9cf8f55070b8aaca6494049f1fab0b
Parents: e6907ed
Author: Koushik Das <ko...@apache.org>
Authored: Tue Nov 4 17:34:07 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Sat Nov 8 13:50:15 2014 +0530
----------------------------------------------------------------------
.../com/cloud/vm/VirtualMachineManagerImpl.java | 12 ---------
.../com/cloud/api/ApiAsyncJobDispatcher.java | 4 ++-
server/src/com/cloud/vm/UserVmManagerImpl.java | 26 +++++++++++++-------
3 files changed, 20 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e25de54b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 4b1597a..d49364f 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2978,18 +2978,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vmProfile.getVirtualMachine().getHypervisorType());
VirtualMachineTO vmTO = hvGuru.implement(vmProfile);
- // don't delete default NIC on a user VM
- if (nic.isDefaultNic() && vm.getType() == VirtualMachine.Type.User) {
- s_logger.warn("Failed to remove nic from " + vm + " in " + network + ", nic is default.");
- throw new CloudRuntimeException("Failed to remove nic from " + vm + " in " + network + ", nic is default.");
- }
-
- // if specified nic is associated with PF/LB/Static NAT
- if (rulesMgr.listAssociatedRulesForGuestNic(nic).size() > 0) {
- throw new CloudRuntimeException("Failed to remove nic from " + vm + " in " + network +
- ", nic has associated Port forwarding or Load balancer or Static NAT rules.");
- }
-
NicProfile nicProfile =
new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(network.getId(), vm.getId()),
_networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e25de54b/server/src/com/cloud/api/ApiAsyncJobDispatcher.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiAsyncJobDispatcher.java b/server/src/com/cloud/api/ApiAsyncJobDispatcher.java
index 71adf2a..0b7d681 100644
--- a/server/src/com/cloud/api/ApiAsyncJobDispatcher.java
+++ b/server/src/com/cloud/api/ApiAsyncJobDispatcher.java
@@ -37,6 +37,7 @@ import org.apache.cloudstack.framework.jobs.AsyncJobDispatcher;
import org.apache.cloudstack.framework.jobs.AsyncJobManager;
import org.apache.cloudstack.jobs.JobInfo;
+import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.utils.component.AdapterBase;
@@ -77,7 +78,6 @@ public class ApiAsyncJobDispatcher extends AdapterBase implements AsyncJobDispat
String acctIdStr = params.get("ctxAccountId");
String contextDetails = params.get("ctxDetails");
-
Long userId = null;
Account accountObject = null;
@@ -109,6 +109,8 @@ public class ApiAsyncJobDispatcher extends AdapterBase implements AsyncJobDispat
// serialize this to the async job table
_asyncJobMgr.completeAsyncJob(job.getId(), JobInfo.Status.SUCCEEDED, 0, ApiSerializerHelper.toSerializedString(cmdObj.getResponseObject()));
+ } catch (InvalidParameterValueException ipve) {
+ throw new ServerApiException(ApiErrorCode.PARAM_ERROR, ipve.getMessage());
} finally {
CallContext.unregister();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e25de54b/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 01a692d..1a024a3 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -37,7 +37,6 @@ import javax.naming.ConfigurationException;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
-
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -1090,15 +1089,16 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
UserVmVO vmInstance = _vmDao.findById(vmId);
if (vmInstance == null) {
- throw new InvalidParameterValueException("unable to find a virtual machine with id " + vmId);
+ throw new InvalidParameterValueException("Unable to find a virtual machine with id " + vmId);
}
NicVO nic = _nicDao.findById(nicId);
if (nic == null) {
- throw new InvalidParameterValueException("unable to find a nic with id " + nicId);
+ throw new InvalidParameterValueException("Unable to find a nic with id " + nicId);
}
+
NetworkVO network = _networkDao.findById(nic.getNetworkId());
if (network == null) {
- throw new InvalidParameterValueException("unable to find a network with id " + nic.getNetworkId());
+ throw new InvalidParameterValueException("Unable to find a network with id " + nic.getNetworkId());
}
// Perform permission check on VM
@@ -1107,19 +1107,28 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
// Verify that zone is not Basic
DataCenterVO dc = _dcDao.findById(vmInstance.getDataCenterId());
if (dc.getNetworkType() == DataCenter.NetworkType.Basic) {
- throw new CloudRuntimeException("Zone " + vmInstance.getDataCenterId() + ", has a NetworkType of Basic. Can't remove a NIC from a VM on a Basic Network");
+ throw new InvalidParameterValueException("Zone " + vmInstance.getDataCenterId() + ", has a NetworkType of Basic. Can't remove a NIC from a VM on a Basic Network");
}
- //check to see if nic is attached to VM
+ // check to see if nic is attached to VM
if (nic.getInstanceId() != vmId) {
- throw new InvalidParameterValueException(nic + " is not a nic on " + vmInstance);
+ throw new InvalidParameterValueException(nic + " is not a nic on " + vmInstance);
}
// Perform account permission check on network
_accountMgr.checkAccess(caller, AccessType.UseEntry, false, network);
- boolean nicremoved = false;
+ // don't delete default NIC on a user VM
+ if (nic.isDefaultNic() && vmInstance.getType() == VirtualMachine.Type.User) {
+ throw new InvalidParameterValueException("Unable to remove nic from " + vmInstance + " in " + network + ", nic is default.");
+ }
+
+ // if specified nic is associated with PF/LB/Static NAT
+ if (_rulesMgr.listAssociatedRulesForGuestNic(nic).size() > 0) {
+ throw new InvalidParameterValueException("Unable to remove nic from " + vmInstance + " in " + network + ", nic has associated Port forwarding or Load balancer or Static NAT rules.");
+ }
+ boolean nicremoved = false;
try {
nicremoved = _itMgr.removeNicFromVm(vmInstance, nic);
} catch (ResourceUnavailableException e) {
@@ -1135,7 +1144,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
s_logger.debug("Successful removal of " + network + " from " + vmInstance);
return _vmDao.findById(vmInstance.getId());
-
}
@Override
[3/3] git commit: updated refs/heads/4.5 to 54ec268
Posted by ko...@apache.org.
CLOUDSTACK-7869: Add simulator support for findHostsForMigration API
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/54ec268b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/54ec268b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/54ec268b
Branch: refs/heads/4.5
Commit: 54ec268b7e1523bb2bb8cae216e173b34895d651
Parents: 4d08bb8
Author: Koushik Das <ko...@apache.org>
Authored: Sat Nov 8 13:46:24 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Sat Nov 8 13:50:43 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/server/ManagementServerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ec268b/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 697d1c4..deb2424 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1123,7 +1123,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
}
if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && !vm.getHypervisorType().equals(HypervisorType.KVM)
- && !vm.getHypervisorType().equals(HypervisorType.Ovm) && !vm.getHypervisorType().equals(HypervisorType.Hyperv) && !vm.getHypervisorType().equals(HypervisorType.LXC)) {
+ && !vm.getHypervisorType().equals(HypervisorType.Ovm) && !vm.getHypervisorType().equals(HypervisorType.Hyperv) && !vm.getHypervisorType().equals(HypervisorType.LXC)
+ && !vm.getHypervisorType().equals(HypervisorType.Simulator)) {
if (s_logger.isDebugEnabled()) {
s_logger.debug(vm + " is not XenServer/VMware/KVM/OVM/Hyperv, cannot migrate this VM.");
}
[2/3] git commit: updated refs/heads/4.5 to 54ec268
Posted by ko...@apache.org.
CLOUDSTACK-7867: Delete network resulting in exception
Publish event was getting called from within a DB transaction which is not allowed.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d08bb89
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d08bb89
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d08bb89
Branch: refs/heads/4.5
Commit: 4d08bb89355a68e8a0e9a2f6654889d008c29ebd
Parents: e25de54
Author: Koushik Das <ko...@apache.org>
Authored: Sat Nov 8 13:17:50 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Sat Nov 8 13:50:31 2014 +0530
----------------------------------------------------------------------
.../engine/orchestration/NetworkOrchestrator.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d08bb89/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index ab5a21c..553bca1 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -2278,10 +2278,6 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
NetworkAccountVO networkAccount = _networkAccountDao.getAccountNetworkMapByNetworkId(networkFinal.getId());
if (networkAccount != null)
_networkAccountDao.remove(networkAccount.getId());
-
- // remove its related ACL permission
- Pair<Class<?>, Long> networkMsg = new Pair<Class<?>, Long>(Network.class, networkFinal.getId());
- _messageBus.publish(_name, EntityManager.MESSAGE_REMOVE_ENTITY_EVENT, PublishScope.LOCAL, networkMsg);
}
NetworkOffering ntwkOff = _entityMgr.findById(NetworkOffering.class, networkFinal.getNetworkOfferingId());
@@ -2292,6 +2288,11 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
}
}
});
+ if (_networksDao.findById(network.getId()) == null) {
+ // remove its related ACL permission
+ Pair<Class<?>, Long> networkMsg = new Pair<Class<?>, Long>(Network.class, networkFinal.getId());
+ _messageBus.publish(_name, EntityManager.MESSAGE_REMOVE_ENTITY_EVENT, PublishScope.LOCAL, networkMsg);
+ }
return true;
} catch (CloudRuntimeException e) {
s_logger.error("Failed to delete network", e);