diff options
author | Egon Valdmees | 2011-06-07 12:24:53 +0000 |
---|---|---|
committer | Egon Valdmees | 2011-06-07 12:44:18 +0000 |
commit | 8e6f2ad9e1eed0be32b2a07dbfdc05a69339976f (patch) | |
tree | 5cc7a2e6e107d60fc1029e70264b067ff90c3c9c | |
parent | 05fdcf6c4d2c3431decd15ec34878853bc85d4e4 (diff) |
leaf branch now accepts add-table events
-rw-r--r-- | python/pgq/cascade/worker.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/python/pgq/cascade/worker.py b/python/pgq/cascade/worker.py index ebcb3eb3..68f9e388 100644 --- a/python/pgq/cascade/worker.py +++ b/python/pgq/cascade/worker.py @@ -131,7 +131,7 @@ class CascadedWorker(CascadedConsumer): for ev in event_list: if st.copy_events: self.copy_event(dst_curs, ev, st.filtered_copy) - if ev.ev_type[:4] == "pgq.": + if ev.ev_type.split('.', 1)[0] in ("pgq", "londiste"): # process cascade events even on waiting leaf node self.process_remote_event(src_curs, dst_curs, ev) else: @@ -162,10 +162,8 @@ class CascadedWorker(CascadedConsumer): # on combined-branch the target can get several batches ahead if wst.wait_behind: - cur_tick = batch_info['tick_id'] - dst_tick = state['completed_tick'] - if cur_tick < dst_tick: - return True + # let the wait-behind logic track ticks + return False # check if events have processed done = CascadedConsumer.is_batch_done(self, state, batch_info, dst_db) |