diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-17 19:29:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-17 19:29:58 +0000 |
| commit | 07470885d5084aa9d357951d948ae205b06bcc5d (patch) | |
| tree | 9058fda0a72a369a85754ae0ad2f3a1c01eacca6 | |
| parent | d912d9cd7d8be23e03e1556349a7ec58a15348ec (diff) | |
| parent | b23f76e67706cc29db96bdcb986020dbc980ce7d (diff) | |
| download | zuul-07470885d5084aa9d357951d948ae205b06bcc5d.tar.gz | |
Merge "Update reconfig event ltime on (smart) reconfig"
| -rw-r--r-- | tests/unit/test_scheduler.py | 4 | ||||
| -rw-r--r-- | zuul/scheduler.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py index 1a5657ed6..172ed34dc 100644 --- a/tests/unit/test_scheduler.py +++ b/tests/unit/test_scheduler.py @@ -3960,6 +3960,10 @@ class TestScheduler(ZuulTestCase): else: time.sleep(0) + self.assertGreater(new.last_reconfigured, old.last_reconfigured) + self.assertGreater(new.last_reconfigure_event_ltime, + old.last_reconfigure_event_ltime) + def test_tenant_reconfiguration_command_socket(self): "Test that single-tenant reconfiguration via command socket works" diff --git a/zuul/scheduler.py b/zuul/scheduler.py index b8314f162..e646c09b8 100644 --- a/zuul/scheduler.py +++ b/zuul/scheduler.py @@ -1528,7 +1528,7 @@ class Scheduler(threading.Thread): with self.createZKContext(lock, self.log) as ctx: if tenant is not None: self._reconfigureTenant(ctx, min_ltimes, - -1, + event.zuul_event_ltime, tenant, old_tenant) else: self._reconfigureDeleteTenant(ctx, old_tenant) |