From 82bb097e9f8fafffb8734fc11e88fed530d7463e Mon Sep 17 00:00:00 2001
From: licanwei <li.canwei2@zte.com.cn>
Date: Thu, 8 Dec 2016 15:06:26 +0800
Subject: [PATCH] Unnecessary exception

If the instance state is not ACTIVE,
There is no need to throw an exception.

Change-Id: I88ba3ae9c92b75ed57fc9647e33c4a10801b2c18
Closes-Bug: #1648309
---
 .../strategy/strategies/vm_workload_consolidation.py            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
index 75069edd8..2aafee63e 100644
--- a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
+++ b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
@@ -164,7 +164,7 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
                     'state=%(instance_state)s.'),
                 instance_uuid=instance_uuid,
                 instance_state=instance_state_str)
-            raise exception.WatcherException
+            return
 
         migration_type = 'live'