summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2012-05-29 10:32:40 +0000
committerMarko Kreen2012-05-29 10:32:40 +0000
commitc6eb5d8a766a8455c10ad5818d4fcc89b15370e0 (patch)
tree3a16b954b9ba2f68368683b039ccfb37011e31bb
parent4fb410863d4ade09e35179d97456b526f2333f28 (diff)
CascadedWorker: merge-leaf-to-branch needs to publish wm info
Somehow the functionality got lost. Seems the area is in need of some cleanups to make code more clear.
-rw-r--r--python/pgq/cascade/worker.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/python/pgq/cascade/worker.py b/python/pgq/cascade/worker.py
index 6e7e8067..3d7dc974 100644
--- a/python/pgq/cascade/worker.py
+++ b/python/pgq/cascade/worker.py
@@ -332,13 +332,17 @@ class CascadedWorker(CascadedConsumer):
"""
# merge-leaf on branch should not update tick pos
- wst = self._worker_state
- if wst.wait_behind:
+ st = self._worker_state
+ if st.wait_behind:
dst_db.commit()
+
+ # still need to publish wm info
+ if st.local_wm_publish and self.main_worker:
+ self.publish_local_wm(src_db, dst_db)
+
return
if self.main_worker:
- st = self._worker_state
dst_curs = dst_db.cursor()
self.flush_events(dst_curs)