Revert "fix: fixed replication lag on slave - added query based on recovery control functions instead of timestamp evaluation; - added new bootstrap optional parameter '-c/--config': bootstrap uses some plugin parameters set by user for functions generating;"

This reverts commit 65ca1e3

Author: cuprumtan

github-actions-tests/tools/bootstrap.sh

@@ -52,6 +52,9 @@ function check_db_objects() {
   echo "MAMONSU_USER = $MAMONSU_USER, MAMONSU_DB = $MAMONSU_DB"
 
   $PSQL $DB -c "\dt mamonsu.config" | grep "mamonsu.*config.*table.*$MAMONSU_USER"  || exit 11
+  MAMONSU_TIMESTAMP_NAME=`echo $MAMONSU_VERSION | sed 's/\./\_/g'`
+  $PSQL $DB -c "\dt mamonsu.timestamp_master_$MAMONSU_TIMESTAMP_NAME" | grep  "mamonsu.*timestamp_master_$MAMONSU_TIMESTAMP_NAME.*table.*$MAMONSU_USER"  || exit 11
+  $PSQL $DB -c "\df mamonsu.timestamp_master_update" | grep  "mamonsu.*timestamp_master_update"  || exit 11
   $PSQL $DB -c "\df mamonsu.timestamp_get" | grep  "mamonsu.*timestamp_get"  || exit 11
   $PSQL $DB -c "\df mamonsu.count_autovacuum" | grep  "mamonsu.*count_autovacuum"  || exit 11
   $PSQL $DB -c "\df mamonsu.get_oldest_xid" | grep  "mamonsu.*get_oldest_xid"  || exit 11

mamonsu/plugins/pgsql/driver/pool.py

@@ -7,6 +7,10 @@ class Pool(object):
 
     SQL = {
         # query type: ( 'if_not_installed', 'if_installed' )
+        'replication_lag_master_query': (
+            'select 1 as replication_lag_master_query',
+            'select mamonsu.timestamp_master_update()'
+        ),
         'replication_lag_slave_query': (
             "SELECT"
             "    CASE WHEN pg_last_{1}() = pg_last_{2}() THEN 0"

mamonsu/plugins/pgsql/xlog.py

@@ -65,6 +65,7 @@ def run(self, zbx):
             if lag[0][0] is not None:
                 zbx.send('pgsql.replication_lag[sec]', float(lag[0][0]))
         else:
+            Pooler.run_sql_type('replication_lag_master_query')
             if Pooler.server_version_greater('10.0'):
                 result = Pooler.query(self.query_wal_lsn_diff)
                 result_lags = Pooler.run_sql_type('wal_lag_lsn', args=[' flush_lag, replay_lag, write_lag, ',

mamonsu/tools/bootstrap/sql.py

@@ -29,12 +29,31 @@
 
 INSERT INTO mamonsu.config(version) VALUES('{0}');
 
+DROP TABLE IF EXISTS mamonsu.timestamp_master_{1};
+
+CREATE TABLE mamonsu.timestamp_master_{1}(
+    id int primary key,
+    ts double precision,
+    lsn pg_lsn
+);
+
+INSERT INTO mamonsu.timestamp_master_{1} (id) values (1);
+
+CREATE OR REPLACE FUNCTION mamonsu.timestamp_master_update()
+RETURNS void AS $$
+  UPDATE mamonsu.timestamp_master_{1} SET
+    ts = extract(epoch from now() at time zone 'utc')::double precision,
+    lsn = pg_catalog.pg_current_{4}()
+  WHERE
+    id = 1;
+$$ LANGUAGE SQL SECURITY DEFINER;
+
 CREATE OR REPLACE FUNCTION mamonsu.timestamp_get()
 RETURNS double precision AS $$
   SELECT
-      CASE WHEN pg_last_{11}() = pg_last_{12}() THEN 0
-      ELSE extract (epoch FROM now() - coalesce(pg_last_xact_replay_timestamp(), now() - INTERVAL '{13} seconds'))
-      END
+    (extract(epoch from now() at time zone 'utc') - ts)::double precision
+  FROM mamonsu.timestamp_master_{1}
+  WHERE id = 1 LIMIT 1;
 $$ LANGUAGE SQL SECURITY DEFINER;
 
 CREATE OR REPLACE FUNCTION mamonsu.count_autovacuum()
@@ -159,6 +178,10 @@
 GrantsOnDefaultSchemaSQL = """
 ALTER TABLE mamonsu.config OWNER TO {1};
 
+ALTER TABLE mamonsu.timestamp_master_{0} OWNER TO {1};
+
+GRANT EXECUTE ON FUNCTION mamonsu.timestamp_master_update() TO {1};
+
 GRANT EXECUTE ON FUNCTION mamonsu.timestamp_get() TO {1};
 
 GRANT EXECUTE ON FUNCTION mamonsu.count_autovacuum() TO {1};

mamonsu/tools/bootstrap/start.py

@@ -4,15 +4,14 @@
 import optparse
 import sys
 
-from mamonsu.lib.config import Config
 import mamonsu.lib.platform as platform
 from mamonsu.lib.parser import MissOptsParser
 from mamonsu.plugins.pgsql.driver.checks import is_conn_to_db
 from mamonsu import __version__ as mamonsu_version
 from mamonsu.lib.default_config import DefaultConfig
 from mamonsu.plugins.pgsql.pool import Pooler
 from mamonsu.tools.bootstrap.sql import CreateMamonsuUserSQL, CreateSchemaExtensionSQL, \
-    CreateSchemaDefaultSQL, GrantsOnDefaultSchemaSQL, GrantsOnExtensionSchemaSQL, QuerySplit
+CreateSchemaDefaultSQL,GrantsOnDefaultSchemaSQL, GrantsOnExtensionSchemaSQL, QuerySplit
 
 
 class Args(DefaultConfig):
@@ -68,11 +67,6 @@ def __init__(self):
             action='store_true',
             dest='create_extensions',
             help='create pg_buffercache extension in mamonsu schema')
-        bootstrap_group.add_option(
-            '-c', '--config',
-            dest='config',
-            default=DefaultConfig.default_config_path(),
-            help='Mamonsu config file')
         parser.add_option_group(group)
         parser.add_option_group(bootstrap_group)
 
@@ -159,9 +153,8 @@ def test_db(self, host_pre):
         return True
 
 
-def fill_query_params(queries, args):
+def fill_query_params(queries):
     formatted_queries = ""
-    cfg = Config(args.args.config)
     for sql in queries.format(
             mamonsu_version,
             mamonsu_version.replace('.', '_'),
@@ -175,10 +168,7 @@ def fill_query_params(queries, args):
             'flush_lag INTERVAL, replay_lag INTERVAL, write_lag INTERVAL,' if Pooler.server_version_greater('10.0')
             else '',
             'lsn' if Pooler.server_version_greater('10.0') else 'location',
-            'walfile' if Pooler.server_version_greater('10.0') else 'xlogfile',
-            'wal_receive_lsn' if Pooler.server_version_greater('10.0') else 'xlog_receive_location',
-            'wal_replay_lsn' if Pooler.server_version_greater('10.0') else 'xlog_replay_location',
-            cfg.fetch('xlog', 'interval')
+            'walfile' if Pooler.server_version_greater('10.0') else 'xlogfile'
     ).split(QuerySplit):
         formatted_queries += sql
     return formatted_queries
@@ -225,15 +215,15 @@ def run_deploy():
         sys.exit(2)
 
     try:
-        bootstrap_queries = fill_query_params(CreateSchemaDefaultSQL, args)
+        bootstrap_queries = fill_query_params(CreateSchemaDefaultSQL)
         Pooler.query(bootstrap_queries)
     except Exception as e:
         sys.stderr.write("Bootstrap execution have exited with an error: {0}\n".format(e))
         sys.exit(2)
 
     if args.args.create_extensions:
         try:
-            bootstrap_extension_queries = fill_query_params(CreateSchemaExtensionSQL, args)
+            bootstrap_extension_queries = fill_query_params(CreateSchemaExtensionSQL)
             Pooler.query(bootstrap_extension_queries)
         except Exception as e:
             sys.stderr.write(