cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 87a5dc5
Date Fri, 28 Jun 2013 05:47:24 GMT
Updated Branches:
  refs/heads/master b09f69d91 -> 87a5dc582


CLOUDSTACK-3239: Delete Traffic Monitor directly without going through maintenance state


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

Branch: refs/heads/master
Commit: 7713c5cdbc07580583f57434306614eedcc4c5ef
Parents: b09f69d
Author: Kishan Kavala <kishan@cloud.com>
Authored: Thu Jun 27 17:34:10 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Fri Jun 28 11:12:55 2013 +0530

----------------------------------------------------------------------
 .../cloud/network/NetworkUsageManagerImpl.java  | 29 ++++++++++----------
 1 file changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7713c5cd/server/src/com/cloud/network/NetworkUsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkUsageManagerImpl.java b/server/src/com/cloud/network/NetworkUsageManagerImpl.java
index 3ac77f9..972d3ff 100755
--- a/server/src/com/cloud/network/NetworkUsageManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkUsageManagerImpl.java
@@ -188,20 +188,14 @@ public class NetworkUsageManagerImpl extends ManagerBase implements
NetworkUsage
     @Override
     public boolean deleteTrafficMonitor(DeleteTrafficMonitorCmd cmd) {
         long hostId = cmd.getId();
-        User caller = _accountMgr.getActiveUser(UserContext.current().getCallerUserId());
         HostVO trafficMonitor = _hostDao.findById(hostId);
         if (trafficMonitor == null) {
             throw new InvalidParameterValueException("Could not find an traffic monitor with
ID: " + hostId);
         }
 
-		try {
-			if (_resourceMgr.maintain(hostId) && _resourceMgr.deleteHost(hostId, false, false))
{
-				return true;
-            } else {
-                return false;
-            }
-        } catch (AgentUnavailableException e) {
-            s_logger.debug(e);
+        if (_resourceMgr.deleteHost(hostId, false, false)) {
+            return true;
+        } else {
             return false;
         }
     }
@@ -528,13 +522,20 @@ public class NetworkUsageManagerImpl extends ManagerBase implements
NetworkUsage
         return host;
     }
 
-	@Override
+    @Override
     public DeleteHostAnswer deleteHost(HostVO host, boolean isForced, boolean isForceDeleteStorage)
throws UnableDeleteHostException {
-		if(host.getType() != Host.Type.TrafficMonitor){
-	    return null;
-    }
+        if(host.getType() != Host.Type.TrafficMonitor){
+            return null;
+        }
+
+        long hostId = host.getId();
+        _agentMgr.disconnectWithoutInvestigation(hostId, Status.Event.Remove);
+        _detailsDao.deleteDetails(hostId);
+        host.setGuid(null);
+        _hostDao.update(hostId, host);
+        _hostDao.remove(hostId);
+        return new DeleteHostAnswer(false);
 
-		return new DeleteHostAnswer(true);
     }
 
 }


Mime
View raw message