summaryrefslogtreecommitdiffstats
path: root/nova/scheduler/driver.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-13 08:27:04 +0000
committerGerrit Code Review <review@openstack.org>2013-02-13 08:27:04 +0000
commitd980805880c681881504e269e03130e4452630ab (patch)
tree537c3b41d9c5e34d97fdc134c983f9e74bd899b4 /nova/scheduler/driver.py
parent8462882137f254d77e372306e91aaa05c50ce423 (diff)
parentbe62d6a86971abac57a1cc03c985ba1e97fd55cb (diff)
downloadnova-d980805880c681881504e269e03130e4452630ab.tar.gz
nova-d980805880c681881504e269e03130e4452630ab.tar.xz
nova-d980805880c681881504e269e03130e4452630ab.zip
Merge "Handle compute node not available for live migration"
Diffstat (limited to 'nova/scheduler/driver.py')
-rw-r--r--nova/scheduler/driver.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py
index 4ad548798..2565e4e40 100644
--- a/nova/scheduler/driver.py
+++ b/nova/scheduler/driver.py
@@ -222,7 +222,10 @@ class Scheduler(object):
"""
# Checking dest exists and compute node.
- dservice_ref = db.service_get_by_compute_host(context, dest)
+ try:
+ dservice_ref = db.service_get_by_compute_host(context, dest)
+ except exception.NotFound:
+ raise exception.ComputeServiceUnavailable(host=dest)
# Checking dest host is alive.
if not self.servicegroup_api.service_is_up(dservice_ref):