diff options
| author | David Subiros <david.perez5@hp.com> | 2011-08-05 16:35:56 +0100 |
|---|---|---|
| committer | Stanislaw Pitucha <stanislaw.pitucha@hp.com> | 2011-10-21 13:32:01 +0100 |
| commit | ad74424768463cd6ad02dd9d6fdf64fc7b3bbafb (patch) | |
| tree | 16a7d0d2c6f136af313be72592f28128f6359440 /nova/utils.py | |
| parent | 75a3fbb21eebd4de8775b63c327d9d57859d090c (diff) | |
| download | nova-ad74424768463cd6ad02dd9d6fdf64fc7b3bbafb.tar.gz nova-ad74424768463cd6ad02dd9d6fdf64fc7b3bbafb.tar.xz nova-ad74424768463cd6ad02dd9d6fdf64fc7b3bbafb.zip | |
Improve the liveness checking for services
With this modification both nova-manage and scheduler use the flag
service_down_time and check positive and negative values in a
correct way.
Fixes bug: 867674.
Change-Id: I15c48d80cafa2089cd228c09c61b0a1e513730e8
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nova/utils.py b/nova/utils.py index 7d34a87d8..ad585ba1c 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -1009,3 +1009,12 @@ def make_dev_path(dev, partition=None, base='/dev'): if partition: path += str(partition) return path + + +def total_seconds(td): + """Local total_seconds implementation for compatibility with python 2.6""" + if hasattr(td, 'total_seconds'): + return td.total_seconds() + else: + return ((td.days * 86400 + td.seconds) * 10 ** 6 + + td.microseconds) / 10.0 ** 6 |