← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/scheduler/filters/ram_filter.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/scheduler/filters/ram_filter.py
14
14
#    License for the specific language governing permissions and limitations
15
15
#    under the License.
16
16
 
17
 
from nova import flags
18
17
from nova.openstack.common import cfg
19
18
from nova.openstack.common import log as logging
20
19
from nova.scheduler import filters
25
24
        default=1.5,
26
25
        help="virtual ram to physical ram allocation ratio")
27
26
 
28
 
FLAGS = flags.FLAGS
29
 
FLAGS.register_opt(ram_allocation_ratio_opt)
 
27
CONF = cfg.CONF
 
28
CONF.register_opt(ram_allocation_ratio_opt)
30
29
 
31
30
 
32
31
class RamFilter(filters.BaseHostFilter):
39
38
        free_ram_mb = host_state.free_ram_mb
40
39
        total_usable_ram_mb = host_state.total_usable_ram_mb
41
40
 
42
 
        memory_mb_limit = total_usable_ram_mb * FLAGS.ram_allocation_ratio
 
41
        memory_mb_limit = total_usable_ram_mb * CONF.ram_allocation_ratio
43
42
        used_ram_mb = total_usable_ram_mb - free_ram_mb
44
43
        usable_ram = memory_mb_limit - used_ram_mb
45
44
        if not usable_ram >= requested_ram: