Yet another attempt to disable autivacuum in snapshot

Author: knizhnik

src/backend/postmaster/autovacuum.c

@@ -93,6 +93,7 @@
 #include "storage/procsignal.h"
 #include "storage/sinvaladt.h"
 #include "storage/smgr.h"
+#include "storage/snapfs.h"
 #include "tcop/tcopprot.h"
 #include "utils/fmgroids.h"
 #include "utils/fmgrprotos.h"
@@ -1957,7 +1958,11 @@ do_autovacuum(void)
 	bool		found_concurrent_worker = false;
 	int			i;
 
-	/*
+	/* Do not perform autovacuum in snapshot */
+	if (!SFS_IN_SNAPSHOT())
+		return;
+
+    /*
 	 * StartTransactionCommand and CommitTransactionCommand will automatically
 	 * switch to other contexts.  We need this one to keep the list of
 	 * relations to vacuum/analyze across transactions.

src/test/isolation/expected/snapfs_grant.out

@@ -62,6 +62,13 @@ step s1_check:
 
 grantee        grantor        privilege_type tableowner     
 
+test_owner     test_owner     DELETE         test_owner     
+test_owner     test_owner     INSERT         test_owner     
+test_owner     test_owner     REFERENCES     test_owner     
+test_owner     test_owner     SELECT         test_owner     
+test_owner     test_owner     TRIGGER        test_owner     
+test_owner     test_owner     TRUNCATE       test_owner     
+test_owner     test_owner     UPDATE         test_owner     
 cnt            
 
 10             
@@ -182,6 +189,13 @@ step s1_check:
 
 grantee        grantor        privilege_type tableowner     
 
+test_owner     test_owner     DELETE         test_owner     
+test_owner     test_owner     INSERT         test_owner     
+test_owner     test_owner     REFERENCES     test_owner     
+test_owner     test_owner     SELECT         test_owner     
+test_owner     test_owner     TRIGGER        test_owner     
+test_owner     test_owner     TRUNCATE       test_owner     
+test_owner     test_owner     UPDATE         test_owner     
 cnt            
 
 10             

src/test/isolation/expected/snapfs_role.out

@@ -1,6 +1,6 @@
 Parsed test spec with 3 sessions
 
-starting permutation: s3_mk_sn s1_cr s3_mk_sn s1_check s1_ar s3_mk_sn s1_dr s1_check s2_check s3_sw_1 s1_check s2_check s3_sw_2 s1_check s2_check s3_sw_3 s1_check s2_check s3_sw_0 s1_check s2_check
+starting permutation: s3_mk_sn s1_cr s3_mk_sn s1_check s1_ar s3_mk_sn s1_dr s1_check s2_check s3_sw_1 s1_check s2_check s3_sw_2 s1_check s2_check s3_sw_3 s1_check s2_check s3_sw_0 s1_check s2_check s3_teardown
 step s3_mk_sn: 
 	select 1 from pg_make_snapshot();
 
@@ -113,11 +113,18 @@ step s2_check:
 
 rolname        rolcanlogin    
 
+step s3_teardown: 
+	select pg_switch_to_snapshot( 0 );
+	select pg_remove_snapshot( ( select recent_snapshot from pg_control_snapshot() ) );
+
+pg_switch_to_snapshot
+
+               
 pg_remove_snapshot
 
 
 
-starting permutation: s3_mk_sn s1_cr s3_mk_sn s1_check s1_ar s3_mk_sn s1_dr s1_check s2_check s3_rc_sn_2 s1_check s2_check
+starting permutation: s3_mk_sn s1_cr s3_mk_sn s1_check s1_ar s3_mk_sn s1_dr s1_check s2_check s3_rc_sn_2 s1_check s2_check s3_rc_sn
 step s3_mk_sn: 
 	select 1 from pg_make_snapshot();
 
@@ -173,11 +180,16 @@ step s1_check:
 
 rolname        rolcanlogin    
 
+regressuser1   f              
 step s2_check: 
 	select rolname, rolcanlogin from pg_roles where rolname in ( 'regressuser1', 'regressuser2' );
 
 rolname        rolcanlogin    
 
-pg_remove_snapshot
+regressuser1   f              
+step s3_rc_sn: 
+  select pg_recover_to_snapshot( ( select recent_snapshot from pg_control_snapshot() ) );
+
+pg_recover_to_snapshot
 
 

src/test/isolation/specs/snapfs_role.spec

@@ -1,11 +1,6 @@
 # Role and permissions checks
 # We are using three backends: read-write, read, snapshot.
 
-teardown {
-	select pg_switch_to_snapshot( 0 );
-	select pg_remove_snapshot( ( select recent_snapshot from pg_control_snapshot() ) );
-}
-
 session "s1"
 step "s1_cr" {
 	create role regressuser1 nologin;
@@ -75,9 +70,13 @@ step "s3_rc_sn_1" {
 step "s3_rc_sn_2" {
   select pg_recover_to_snapshot( ( select recent_snapshot - 1 from pg_control_snapshot() ) );
 }
+step "s3_teardown" {
+	select pg_switch_to_snapshot( 0 );
+	select pg_remove_snapshot( ( select recent_snapshot from pg_control_snapshot() ) );
+}
 
-permutation "s3_mk_sn" "s1_cr" "s3_mk_sn" "s1_check" "s1_ar" "s3_mk_sn" "s1_dr" "s1_check" "s2_check" "s3_sw_1" "s1_check" "s2_check" "s3_sw_2" "s1_check" "s2_check" "s3_sw_3" "s1_check" "s2_check" "s3_sw_0" "s1_check" "s2_check"
+permutation "s3_mk_sn" "s1_cr" "s3_mk_sn" "s1_check" "s1_ar" "s3_mk_sn" "s1_dr" "s1_check" "s2_check" "s3_sw_1" "s1_check" "s2_check" "s3_sw_2" "s1_check" "s2_check" "s3_sw_3" "s1_check" "s2_check" "s3_sw_0" "s1_check" "s2_check" "s3_teardown" 
 #permutation "s3_mk_sn" "s1_cr" "s3_mk_sn" "s1_check" "s1_ar" "s3_mk_sn" "s1_dr" "s1_check" "s2_check" "s1_sb_1" "s1_check" "s2_check" "s1_sb_2" "s1_check" "s2_check" "s1_sb_3" "s1_check" "s2_check" "s1_sb_0" "s1_check" "s2_check"
 #permutation "s3_mk_sn" "s1_cr" "s3_mk_sn" "s1_check" "s1_ar" "s3_mk_sn" "s1_dr" "s1_check" "s2_check" "s2_sb_1" "s1_check" "s2_check" "s2_sb_2" "s1_check" "s2_check" "s2_sb_3" "s1_check" "s2_check" "s2_sb_0" "s1_check" "s2_check"
-permutation "s3_mk_sn" "s1_cr" "s3_mk_sn" "s1_check" "s1_ar" "s3_mk_sn" "s1_dr" "s1_check" "s2_check" "s3_rc_sn_2" "s1_check" "s2_check"
+permutation "s3_mk_sn" "s1_cr" "s3_mk_sn" "s1_check" "s1_ar" "s3_mk_sn" "s1_dr" "s1_check" "s2_check" "s3_rc_sn_2" "s1_check" "s2_check" "s3_rc_sn"
 #permutation "s3_mk_sn" "s1_cr" "s3_mk_sn" "s1_check" "s1_ar" "s3_mk_sn" "s1_dr" "s1_check" "s2_check" "s3_rc_sn" "s1_check" "s2_check" "s3_rc_sn" "s1_check" "s2_check" "s3_rc_sn" "s1_check" "s2_check" "s3_mk_sn"