From 588cba66c6621ad7f90880d251cf502ae55fc66c Mon Sep 17 00:00:00 2001 From: Jake Liu Date: Tue, 10 Sep 2013 09:16:48 -0400 Subject: [PATCH] Remove _assert_compute_node_has_enough_memory from filter_scheduler.py Now the function _assert_compute_node_has_enough_memory has no use in filter_scheduler.py, just remove it to make code more clean. Change-Id: Ie6f104368140b69a60e124ea96ef6bf7715fe34e --- nova/scheduler/filter_scheduler.py | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/nova/scheduler/filter_scheduler.py b/nova/scheduler/filter_scheduler.py index d5f2848ef..41dc7ae56 100644 --- a/nova/scheduler/filter_scheduler.py +++ b/nova/scheduler/filter_scheduler.py @@ -23,7 +23,6 @@ import random from oslo.config import cfg -from nova.compute import flavors from nova.compute import rpcapi as compute_rpcapi from nova import db from nova import exception @@ -372,32 +371,3 @@ class FilterScheduler(driver.Scheduler): """ service_ref = db.service_get_by_compute_host(context, dest) return service_ref['compute_node'][0] - - def _assert_compute_node_has_enough_memory(self, context, - instance_ref, dest): - """Checks if destination host has enough memory for live migration. - - - :param context: security context - :param instance_ref: nova.db.sqlalchemy.models.Instance object - :param dest: destination host - - """ - compute = self._get_compute_info(context, dest) - node = compute.get('hypervisor_hostname') - host_state = self.host_manager.host_state_cls(dest, node) - host_state.update_from_compute_node(compute) - - instance_type = flavors.extract_flavor(instance_ref) - filter_properties = {'instance_type': instance_type} - - hosts = self.host_manager.get_filtered_hosts([host_state], - filter_properties, - 'RamFilter') - if not hosts: - instance_uuid = instance_ref['uuid'] - reason = (_("Unable to migrate %(instance_uuid)s to %(dest)s: " - "Lack of memory") - % {'instance_uuid': instance_uuid, - 'dest': dest}) - raise exception.MigrationPreCheckError(reason=reason)