openstack/aodh
Code Issues Proposed changes

reset croniter to avoid cur time shift

Browse Source 
When we evaluate alarms, we check the time constraints, and will check
if it is exactly match firstly, but croniter get_prev() and get_next() will
change croniter.cur time, then if it is not exactly match, the cur time is
no longer the current time, and the second call to get_prev() is not same
as first get_prev(), finally, a wrong value may returned.

For example, if start="0 11 31 * *", and current time is 2015-03-31T11:30:00,
then first get_prev() is 2015-03-31T11:00:00, but second one is 2015-05-01T11:00:00

This patch fixes it by creating a new croniter object with current time.

Change-Id: Iaeb1f763ffc33b726d132a234c8e4e08db00a8fe
Closes-Bug: #1438674
This commit is contained in:
ZhiQiang Fan 2015-04-01 19:41:45 +08:00
parent 65099e6aae
commit 2de5cfbd8c
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceilometer/alarm/evaluator/__init__.py
View File

@ -102,6 +102,9 @@ class Evaluator(object):
start_cron = croniter.croniter(tc['start'], now_tz)
if cls._is_exact_match(start_cron, now_tz):
return True
# start_cron.cur has changed in _is_exact_match(),
# croniter cannot recover properly in some corner case.
start_cron = croniter.croniter(tc['start'], now_tz)
latest_start = start_cron.get_prev(datetime.datetime)
duration = datetime.timedelta(seconds=tc['duration'])
if latest_start <= now_tz <= latest_start + duration:

14
ceilometer/tests/alarm/evaluator/test_base.py
View File

@ -71,6 +71,20 @@ class TestEvaluatorBaseClass(base.BaseTestCase):
mock_utcnow.return_value = datetime.datetime(2014, 1, 2, 5, 0, 0)
self.assertFalse(cls.within_time_constraint(alarm))
@mock.patch.object(timeutils, 'utcnow')
def test_base_time_constraints_by_month(self, mock_utcnow):
alarm = mock.MagicMock()
alarm.time_constraints = [
{'name': 'test',
'description': 'test',
'start': '0 11 31 1,3,5,7,8,10,12 *', # every 31st at 11:00
'duration': 10800, # 3 hours
'timezone': ''},
]
cls = evaluator.Evaluator
mock_utcnow.return_value = datetime.datetime(2015, 3, 31, 11, 30, 0)
self.assertTrue(cls.within_time_constraint(alarm))
@mock.patch.object(timeutils, 'utcnow')
def test_base_time_constraints_complex(self, mock_utcnow):
alarm = mock.MagicMock()