Fix pgaudit testing

configure.in

@@ -872,15 +872,29 @@ AS_IF([test "$enable_yezzey" = yes],
 #
 PGAC_ARG_BOOL(enable, sr_plan, yes, [disable sr_plan support],
               [AC_DEFINE([USE_SR_PLAN], 1,
-                [Define to 1 to build with yezzey (--enable-sr-plan)])])
-AC_MSG_RESULT([checking whether to build with yezzey... $enable_sr_plan])
+                [Define to 1 to build with sr_plan (--enable-sr-plan)])])
+AC_MSG_RESULT([checking whether to build with sr_plan... $enable_sr_plan])
 AC_SUBST(enable_sr_plan)
 
 AS_IF([test "$enable_sr_plan" = yes],
 [ # then
   AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
 ]) # fi
 
+#
+# pgaudit, enabled by default
+#
+PGAC_ARG_BOOL(enable, pgaudit, yes, [disable pgaudit support],
+              [AC_DEFINE([USE_PGAUDIT], 1,
+                [Define to 1 to build with pgaudit (--enable-pgaudit)])])
+AC_MSG_RESULT([checking whether to build with pgaudit... $enable_sr_plan])
+AC_SUBST(enable_pgaudit)
+
+AS_IF([test "$enable_pgaudit" = yes],
+[ # then
+  AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
+]) # fi
+
 #
 # ic-proxy
 #

docker/test/run_tests.sh

@@ -69,13 +69,23 @@ make destroy-demo-cluster && make create-demo-cluster
 export USER=gpadmin
 source gpAux/gpdemo/gpdemo-env.sh
 
-gpconfig -c shared_preload_libraries -v yezzey
+gpconfig -c shared_preload_libraries -v pgaudit
 
 # ADD CGROUPS
 if [ "${TEST_CGROUP}" = "true" ]; then
     gpconfig -c gp_resource_manager -v "group"
 fi
 
+# Accept local connections for tests
+cat >>gpAux/gpdemo/datadirs/qddir/demoDataDir-1/pg_hba.conf <<EOL
+# "local" is for Unix domain socket connections only
+local   all             all                                     trust
+# IPv4 local connections:
+host    all             all             127.0.0.1/24            trust
+# IPv6 local connections:
+host    all             all             ::1/128                 trust
+EOL
+
 gpstop -a -i && gpstart -a
 
 createdb $USER

gpcontrib/Makefile

@@ -78,15 +78,13 @@ orafce:
 	fi
 
 sr_plan:
-	@if [ "$(enable_sr_plan)" == "yes" ]; then \
-  		$(MAKE) -C sr_plan USE_PGXS=1 && \
-  		$(MAKE) -C sr_plan USE_PGXS=1 install; \
+	@if [ "$(enable_sr_plan)" = "yes" ]; then \
+  		$(MAKE) -C sr_plan && \
  	fi
 
 pgaudit:
-	@if [ "$(enable_pgaudit)" == "yes" ]; then \
-  		$(MAKE) -C pgaudit USE_PGXS=1 && \
-  		$(MAKE) -C pgaudit USE_PGXS=1 install; \
+	@if [ "$(enable_pgaudit)" = "yes" ]; then \
+  		$(MAKE) -C pgaudit && \
  	fi
 
 
@@ -98,6 +96,12 @@ install:
 	@if [ "$(enable_yezzey)" = "yes" ]; then \
 		$(MAKE) -C yezzey install; \
 	fi
+	@if [ "$(enable_pgaudit)" = "yes" ]; then \
+  		$(MAKE) -C pgaudit install; \
+ 	fi
+	@if [ "$(enable_sr_plan)" = "yes" ]; then \
+  		$(MAKE) -C sr_plan install; \
+ 	fi
 	@if [ "$(enable_mapreduce)" = "yes" ]; then \
 		$(MAKE) -C gpmapreduce install; \
 	fi
@@ -119,6 +123,8 @@ distclean:
 	if [ "$(enable_gpcloud)" = "yes" ]; then $(MAKE) -C gpcloud distclean; fi
 	if [ "$(enable_yezzey)" = "yes" ]; then $(MAKE) -C yezzey distclean; fi
 	if [ "${enable_orafce}" = "yes" ]; then $(MAKE) -C orafce NO_PGXS=true distclean; fi
+	if [ "${enable_sr_plan}" = "yes" ]; then $(MAKE) -C sr_plan distclean; fi
+	if [ "${enable_pgaudit}" = "yes" ]; then $(MAKE) -C pgaudit distclean; fi
 
 installcheck:
 	$(MAKE) -C gp_internal_tools installcheck

gpcontrib/pgaudit/Makefile

@@ -8,7 +8,7 @@ DATA = pgaudit--1.0.9.sql pgaudit--1.0--1.0.6.sql pgaudit--1.0.6--1.0.7.sql pgau
 PGFILEDESC = "pgAudit - An audit logging extension for PostgreSQL"
 
 REGRESS = pgaudit
-REGRESS_OPTS = --temp-config=$(top_srcdir)/contrib/pgaudit/pgaudit.conf
+REGRESS_OPTS = --init-file=$(top_srcdir)/src/test/regress/init_file
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
@@ -18,5 +18,5 @@ else
 subdir = gpcontrib/pgaudit
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/gpcontrib/contrib-global.mk
+include $(top_srcdir)/contrib/contrib-global.mk
 endif

gpcontrib/pgaudit/expected/pgaudit.out

@@ -1,5 +1,7 @@
 \set VERBOSITY terse
 -- Create pgaudit extension
+CREATE EXTENSION IF NOT EXISTS gp_aux_catalog;
+-- Create pgaudit extension
 CREATE EXTENSION IF NOT EXISTS pgaudit;
 -- Make sure events don't get logged twice when session logging
 SET pgaudit.log = 'all';
@@ -882,7 +884,7 @@ BEGIN
 		id INT
 	);
 END $$;",<none>
-ERROR:  schema "bogus" does not exist at character 14
+ERROR:  schema "bogus" does not exist
 --
 -- Test alter table statements
 ALTER TABLE public.test
@@ -1175,6 +1177,7 @@ DROP TABLE wombat;
 NOTICE:  AUDIT: SESSION,70,1,DDL,DROP TABLE,TABLE,public.wombat,DROP TABLE wombat;,<none>
 SET pgaudit.log = 'NONE';
 DROP EXTENSION pgaudit;
+DROP EXTENSION gp_aux_catalog;
 DROP OPERATOR <> (text, text);
 ERROR:  cannot drop operator <>(text,text) because it is required by the database system
 DROP FUNCTION my_ne(text, text);

gpcontrib/pgaudit/pgaudit.c

@@ -37,6 +37,9 @@
 #include "utils/syscache.h"
 #include "utils/timestamp.h"
 
+// For GpIdentity
+#include "cdb/cdbvars.h"
+
 PG_MODULE_MAGIC;
 
 void _PG_init(void);
@@ -1977,21 +1980,24 @@ _PG_init(void)
         GUC_NOT_IN_SAMPLE,
         NULL, NULL, NULL);
 
-    /*
-     * Install our hook functions after saving the existing pointers to
-     * preserve the chains.
-     */
-    next_ExecutorStart_hook = ExecutorStart_hook;
-    ExecutorStart_hook = pgaudit_ExecutorStart_hook;
 
-    next_ExecutorCheckPerms_hook = ExecutorCheckPerms_hook;
-    ExecutorCheckPerms_hook = pgaudit_ExecutorCheckPerms_hook;
+    if (GpIdentity.segindex == -1) {
+        /*
+        * Install our hook functions after saving the existing pointers to
+        * preserve the chains.
+        */
+        next_ExecutorStart_hook = ExecutorStart_hook;
+        ExecutorStart_hook = pgaudit_ExecutorStart_hook;
+
+        next_ExecutorCheckPerms_hook = ExecutorCheckPerms_hook;
+        ExecutorCheckPerms_hook = pgaudit_ExecutorCheckPerms_hook;
 
-    next_ProcessUtility_hook = ProcessUtility_hook;
-    ProcessUtility_hook = pgaudit_ProcessUtility_hook;
+        next_ProcessUtility_hook = ProcessUtility_hook;
+        ProcessUtility_hook = pgaudit_ProcessUtility_hook;
 
-    next_object_access_hook = object_access_hook;
-    object_access_hook = pgaudit_object_access_hook;
+        next_object_access_hook = object_access_hook;
+        object_access_hook = pgaudit_object_access_hook;
+    }
 
     /* Log that the extension has completed initialization */
 #ifndef EXEC_BACKEND

gpcontrib/pgaudit/sql/pgaudit.sql

@@ -816,6 +816,7 @@ DROP TABLE wombat;
 
 SET pgaudit.log = 'NONE';
 DROP EXTENSION pgaudit;
+DROP EXTENSION gp_aux_catalog;
 
 DROP OPERATOR <> (text, text);
 DROP FUNCTION my_ne(text, text);

src/Makefile.global.in

@@ -220,6 +220,7 @@ enable_mapreduce    = @enable_mapreduce@
 enable_gpcloud 	    = @enable_gpcloud@
 enable_yezzey 	    = @enable_yezzey@
 enable_sr_plan      = @enable_sr_plan@
+enable_pgaudit      = @enable_pgaudit@
 enable_gpperfmon    = @enable_gpperfmon@
 enable_ic_proxy     = @enable_ic_proxy@