better

src/__init__.py

@@ -78,6 +78,7 @@ def read_config(filename=None, options=None):
             'ca_cert': None,
             'verify_certs': 'no',
             'drop_slot_countdown': 10,
+            'replication_slots_polling': None,
         },
         'primary': {
             'change_replication_type': 'yes',
@@ -132,6 +133,8 @@ def read_config(filename=None, options=None):
         for key, value in defaults[section].items():
             if not config.has_option(section, key):
                 config.set(section, key, value)
+    if config.get('global', 'replication_slots_polling') is None:
+        config.set('global', 'replication_slots_polling', config.get('global', 'use_replication_slots'))
 
     #
     # Rewriting global config with parameters from command line.

src/main.py

@@ -639,7 +639,7 @@ def non_ha_replica_iter(self, db_state, zk_state):
             )
             current_primary = zk_state['lock_holder']
 
-            if streaming_from_primary:
+            if streaming_from_primary and not streaming:
                 self._acquire_replication_source_slot_lock(current_primary)
             if streaming:
                 self._acquire_replication_source_slot_lock(stream_from)
@@ -1093,7 +1093,7 @@ def _attach_to_primary(self, new_primary, limit):
         return True
 
     def _handle_slots(self):
-        if not self.config.getboolean('global', 'use_replication_slots'):
+        if not self.config.getboolean('global', 'replication_slots_polling'):
             return
 
         my_hostname = helpers.get_hostname()
@@ -1146,7 +1146,7 @@ def _get_db_state(self):
         return state
 
     def _acquire_replication_source_slot_lock(self, source):
-        if not self.config.getboolean('global', 'use_replication_slots'):
+        if not self.config.getboolean('global', 'replication_slots_polling'):
             return
         # We need to drop the slot in the old primary.
         # But we don't know who the primary was (probably there are many of them).

tests/features/kill_primary.feature

@@ -343,7 +343,7 @@ Feature: Destroy primary in various scenarios
           - client_hostname: pgconsul_postgresql3_1.pgconsul_pgconsul_net
             state: streaming
         """
-        When we set value "no" for option "use_replication_slots" in section "global" in pgconsul config in container "postgresql3"
+        When we set value "no" for option "replication_slots_polling" in section "global" in pgconsul config in container "postgresql3"
         And we restart "pgconsul" in container "postgresql3"
         When we stop container "postgresql3"
         And we wait "10.0" seconds
@@ -359,7 +359,7 @@ Feature: Destroy primary in various scenarios
         Then <lock_type> "<lock_host>" has holder "pgconsul_postgresql2_1.pgconsul_pgconsul_net" for lock "/pgconsul/postgresql/leader"
         Then container "postgresql2" became a primary
         Then <lock_type> "<lock_host>" has value "finished" for key "/pgconsul/postgresql/failover_state"
-        When we set value "yes" for option "use_replication_slots" in section "global" in pgconsul config in container "postgresql3"
+        When we set value "yes" for option "replication_slots_polling" in section "global" in pgconsul config in container "postgresql3"
         And we restart "pgconsul" in container "postgresql3"
         Then container "postgresql3" is in quorum group
         Then <lock_type> "<lock_host>" has following values for key "/pgconsul/postgresql/replics_info"