cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject git commit: updated refs/heads/4.2 to 74293f7
Date Wed, 07 Aug 2013 07:59:39 GMT
Updated Branches:
  refs/heads/4.2 23aaeafd2 -> 74293f77e


CLOUDSTACK-4025. NPE observed during VM start.
NPE was hit during VM start because the network it was to be deployed in didn't get implemented
- Handling this failure.


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

Branch: refs/heads/4.2
Commit: 74293f77e06fcf02d461965cf559afed412f36c9
Parents: 23aaeaf
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Wed Aug 7 13:21:57 2013 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Wed Aug 7 13:24:50 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74293f77/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 ad79a2f..36e889d 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2080,6 +2080,10 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager,
L
 
         for (NicVO nic : nics) {
             Pair<NetworkGuru, NetworkVO> implemented = implementNetwork(nic.getNetworkId(),
dest, context);
+            if (implemented.first() == null) {
+                s_logger.warn("Failed to implement network id=" + nic.getNetworkId() + "
as a part of preparing nic id=" + nic.getId());
+                throw new CloudRuntimeException("Failed to implement network id=" + nic.getNetworkId()
+ " as a part preparing nic id=" +nic.getId());
+            }
 
             NetworkVO network = implemented.second();
             NicProfile profile = prepareNic(vmProfile, dest, context, nic.getId(), network);


Mime
View raw message