From c6eb5d8a766a8455c10ad5818d4fcc89b15370e0 Mon Sep 17 00:00:00 2001
From: Marko Kreen
Date: Tue, 29 May 2012 13:32:40 +0300
Subject: 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.
---
 python/pgq/cascade/worker.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'python/pgq/cascade')

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)
-- 
cgit v1.2.3