Merge branch 'multisite' into fix/ctl-site-switchover

Author: avandras

patroni/ha.py

@@ -1628,7 +1628,7 @@ def before_shutdown() -> None:
                     self.release_leader_key_voluntarily(checkpoint_location)
             time.sleep(2)  # Give a time to somebody to take the leader lock
         if mode == 'multisite':
-            self.patroni.multisite.on_shutdown(self.state_handler.latest_checkpoint_location())
+            self.patroni.multisite.on_shutdown(self.state_handler.latest_checkpoint_location(), None)
         if mode_control['offline']:
             node_to_follow, leader = None, None
         else:

patroni/multisite.py

@@ -63,7 +63,7 @@ def status(self) -> Dict[str, Any]:
     def should_failover(self) -> bool:
         return False
 
-    def on_shutdown(self, checkpoint_location: Optional[int]):
+    def on_shutdown(self, checkpoint_location: int, prev_location: int):
         pass
 
 
@@ -172,7 +172,7 @@ def release(self):
     def should_failover(self):
         return self._failover_target is not None and self._failover_target != self.name
 
-    def on_shutdown(self, checkpoint_location: Optional[int]):
+    def on_shutdown(self, checkpoint_location: int, prev_location: int):
         """ Called when shutdown for multisite failover has completed.
         """
         # TODO: check if we replicated everything to standby site