From 4bbed17d0211a59cc39ff56a6a33ffcd27babf19 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Wed, 22 Jun 2011 18:38:20 -0700
Subject: [PATCH] 1. return message to UI if adding primary storage failed 2.
 delete primary storage entry if if adding primary storage failed

---
 .../src/com/cloud/agent/manager/AgentManagerImpl.java  |  5 -----
 server/src/com/cloud/storage/StorageManagerImpl.java   | 10 +++++++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 7c27556a4df..cb0564ba2c0 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1426,11 +1426,6 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
                 return null;
             }
 
-            if (!answer.getResult()) {
-                s_logger.warn("Unable to execute command: " + cmd.toString() + " due to " + answer.getDetails());
-                return null;
-            }
-
             if (s_logger.isDebugEnabled() && answer.getDetails() != null) {
                 s_logger.debug("Details from executing " + cmd.getClass().toString() + ": " + answer.getDetails());
             }
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index c8a5c6144a6..819c44988a2 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1420,12 +1420,16 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
         if (answer != null && answer.getResult()) {
             return true;
         } else {
+            _storagePoolDao.expunge(pool.getId());
+            String msg = "";
             if (answer != null) {
-                s_logger.warn(" can not create strorage pool through host " + hostId + " due to " + answer.getDetails());
+                msg = "Can not create strorage pool through host " + hostId + " due to " + answer.getDetails();
+                s_logger.warn(msg);
             } else {
-                s_logger.warn(" can not create strorage pool through host " + hostId + " due to CreateStoragePoolCommand returns null");
+                msg = "Can not create strorage pool through host " + hostId + " due to CreateStoragePoolCommand returns null";
+                s_logger.warn(msg);
             }
-            return false;
+            throw new CloudRuntimeException(msg);
         }
     }