openstack
/
nova
Code Issues Proposed changes

Merge "Use math.gcd starting with python 3.5"

This commit is contained in:
Zuul 2019-02-14 17:05:21 +00:00 committed by Gerrit Code Review
parent ee57c92e8b 6dec446363
commit ca197f3dbe
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/virt/hardware.py
View File

@ -15,6 +15,7 @@
import collections
import fractions
import itertools
import math
from oslo_log import log as logging
from oslo_serialization import jsonutils
@ -743,8 +744,12 @@ def _pack_instance_onto_cores(host_cell, instance_cell,
threads) and 2 (number of 'orphan' CPUs) and get 2 as the number of
threads.
"""
return fractions.gcd(threads_per_core, _orphans(instance_cell,
threads_per_core))
# fractions.gcd is deprecated in favor of math.gcd starting in py35
if six.PY2:
gcd = fractions.gcd
else:
gcd = math.gcd
return gcd(threads_per_core, _orphans(instance_cell, threads_per_core))
def _get_pinning(threads_no, sibling_set, instance_cores):
"""Determines pCPUs/vCPUs mapping