only instantiate indexer once for replication

Also makes sure that indexer object exists everywhere were needed.

See #2518.

diff --git a/nominatim/clicmd/replication.py b/nominatim/clicmd/replication.py
index 44eec5f185e9ad03accc0b2c55f27ba71678c9cb..7ad82c4fff6190667a63fbcc4c073de7a3e4485a 100644 (file)
--- a/nominatim/clicmd/replication.py
+++ b/nominatim/clicmd/replication.py
@@ -136,6 +136,7 @@ class UpdateReplication:
             recheck_interval = args.config.get_int('REPLICATION_RECHECK_INTERVAL')
 
         tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)
             recheck_interval = args.config.get_int('REPLICATION_RECHECK_INTERVAL')
 
         tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)

+        indexer = Indexer(args.config.get_libpq_dsn(), tokenizer, args.threads or 1)

 
         while True:
             with connect(args.config.get_libpq_dsn()) as conn:
 
         while True:
             with connect(args.config.get_libpq_dsn()) as conn:


@@ -148,8 +149,6 @@ class UpdateReplication:
 
             if state is not replication.UpdateState.NO_CHANGES and args.do_index:
                 index_start = dt.datetime.now(dt.timezone.utc)
 
             if state is not replication.UpdateState.NO_CHANGES and args.do_index:
                 index_start = dt.datetime.now(dt.timezone.utc)

-                indexer = Indexer(args.config.get_libpq_dsn(), tokenizer,
-                                  args.threads or 1)

                 indexer.index_full(analyse=False)
 
                 with connect(args.config.get_libpq_dsn()) as conn:
                 indexer.index_full(analyse=False)
 
                 with connect(args.config.get_libpq_dsn()) as conn:

diff --git a/test/python/test_cli_replication.py b/test/python/test_cli_replication.py
index 2dd35c0e532d246546d13e6e65863867644aa14d..8e47e96e208fce677c7e42fd611f6992d52a7336 100644 (file)
--- a/test/python/test_cli_replication.py
+++ b/test/python/test_cli_replication.py
@@ -106,6 +106,16 @@ class TestCliReplication:
         assert str(update_mock.last_args[1]['osm2pgsql']) == '/secret/osm2pgsql'
 
 
         assert str(update_mock.last_args[1]['osm2pgsql']) == '/secret/osm2pgsql'
 
 

+    @pytest.mark.parametrize("update_interval", [60, 3600])
+    def test_replication_catchup(self, monkeypatch, index_mock, update_interval, placex_table):
+        monkeypatch.setenv('NOMINATIM_REPLICATION_UPDATE_INTERVAL', str(update_interval))
+        states = [nominatim.tools.replication.UpdateState.NO_CHANGES]
+        monkeypatch.setattr(nominatim.tools.replication, 'update',
+                            lambda *args, **kwargs: states.pop())
+
+        assert self.call_nominatim('--catch-up') == 0
+
+

     def test_replication_update_custom_threads(self, update_mock):
         assert self.call_nominatim('--once', '--no-index', '--threads', '4') == 0
 
     def test_replication_update_custom_threads(self, update_mock):
         assert self.call_nominatim('--once', '--no-index', '--threads', '4') == 0