check_wal_files: Use pg_ls_waldir() on PG10+

df7cb · df7cb · commit 8e6b3c2514a1 · 2018-06-07T16:18:14.000+02:00
Close bucardo#145
diff --git a/check_postgres.pl b/check_postgres.pl
@@ -8682,8 +8682,8 @@ sub check_wal_files {
 
     ## Figure out where the pg_xlog directory is
     $SQL = qq{SELECT count(*) AS count FROM $lsfunc($lsargs) WHERE $lsfunc ~ E'^[0-9A-F]{24}$extrabit\$'}; ## no critic (RequireInterpolationOfMetachars)
-    my $SQL10 = $SQL;
-    $SQL10 =~ s/pg_xlog/pg_wal/g unless ($opt{lsfunc});
+    my $SQL10 = $opt{lsfunc} ? $SQL :
+        qq{SELECT count(*) AS count FROM pg_ls_waldir() WHERE name ~ E'^[0-9A-F]{24}$extrabit\$'}; ## no critic (RequireInterpolationOfMetachars)
 
     my $info = run_command($SQL, {regex => qr[\d], version => [">9.6 $SQL10"] });
 
diff --git a/t/02_wal_files.t b/t/02_wal_files.t
@@ -49,6 +49,9 @@ like ($cp->run('--critical=1'), qr{^$label CRITICAL}, $t);
 
 $cp->drop_schema_if_exists();
 $cp->create_fake_pg_table('pg_ls_dir', 'text');
+if ($ver >= 100000) {
+    $dbh->do("CREATE OR REPLACE FUNCTION cptest.pg_ls_waldir() RETURNS table(name text) AS 'SELECT * FROM cptest.pg_ls_dir' LANGUAGE SQL");
+}
 $dbh->commit();
 
 like ($cp->run('--critical=1'), qr{^$label OK}, $t);
@@ -67,7 +70,7 @@ is ($cp->run('--critical=101 --output=mrtg'), "99\n0\n\n\n", $t);
 
 # test --lsfunc
 my $xlogdir = $ver >= 100000 ? 'pg_wal' : 'pg_xlog';
-$dbh->do(qq{CREATE FUNCTION ls_xlog_dir()
+$dbh->do(qq{CREATE OR REPLACE FUNCTION ls_xlog_dir()
       RETURNS SETOF TEXT
       AS \$\$ SELECT pg_ls_dir('$xlogdir') \$\$
       LANGUAGE SQL
