diff options
| author | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-03-10 13:30:52 +0900 |
|---|---|---|
| committer | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-03-10 13:30:52 +0900 |
| commit | f0bb6d9fc47b92d335c7d7fa238dfd43f0dbdf69 (patch) | |
| tree | 81f5f0cdee61e596ba96e8b5ded6132e28e9466a /nova/scheduler | |
| parent | 1b9ac145de54447f37cdea50ddd1dd028e5f57c1 (diff) | |
| download | nova-f0bb6d9fc47b92d335c7d7fa238dfd43f0dbdf69.tar.gz nova-f0bb6d9fc47b92d335c7d7fa238dfd43f0dbdf69.tar.xz nova-f0bb6d9fc47b92d335c7d7fa238dfd43f0dbdf69.zip | |
fixed based on reviewer's comment.
Diffstat (limited to 'nova/scheduler')
| -rw-r--r-- | nova/scheduler/driver.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index 791f9000d..ed3dfe1c0 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -226,7 +226,6 @@ class Scheduler(object): "args": {'cpu_info': oservice_ref['cpu_info']}}) except rpc.RemoteError: - ec2_id = instance_ref['hostname'] src = instance_ref['host'] logging.exception(_("host %(dest)s is not compatible with " "original host %(src)s.") % locals()) @@ -259,9 +258,10 @@ class Scheduler(object): mem_avail = mem_total - mem_used mem_inst = instance_ref['memory_mb'] if mem_avail <= mem_inst: - raise exception.NotEmpty(_("%(ec2_id)s is not capable to " - "migrate %(dest)s (host:%(mem_avail)s " - " <= instance:%(mem_inst)s)") + raise exception.NotEmpty(_("Unable to migrate %(ec2_id)s " + "to destination: %(dest)s " + "(host:%(mem_avail)s " + "<= instance:%(mem_inst)s)") % locals()) def mounted_on_same_shared_storage(self, context, instance_ref, dest): @@ -292,7 +292,7 @@ class Scheduler(object): except rpc.RemoteError: ipath = FLAGS.instances_path - logging.error(_("Cannot comfirm tmpfile at %(ipath)s is on " + logging.error(_("Cannot confirm tmpfile at %(ipath)s is on " "same shared storage between %(src)s " "and %(dest)s.") % locals()) raise |