Merge branch 'pg15' into pg15-cherrypicks

yugabyte · Aug 1, 2024 · 1841718 · 1841718
2 parents 90c6834 + cfeda57
commit 1841718
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/jenkins_jobs.yml b/jenkins_jobs.yml
@@ -6,13 +6,10 @@ jobs:
     build_type: asan
     release_artifact: false
 
-# YB_TODO: build failure:
-# libpq.so.5.15:                 U __tsan_func_exit
-# libpq must not be calling any function which invokes exit
-#  - os: alma8
-#    compiler: clang17
-#    build_type: tsan
-#    release_artifact: false
+  - os: alma8
+    compiler: clang17
+    build_type: tsan
+    release_artifact: false
 
   - os: alma8
     compiler: gcc11

diff --git a/pg15_tests/passing_tests.tsv b/pg15_tests/passing_tests.tsv
@@ -448,7 +448,6 @@ pgwrapper_pg_ddl_atomicity-test	PgDdlAtomicitySanityTest.DropColumnWithMissingDe
 pgwrapper_pg_ddl_atomicity-test	PgDdlAtomicitySanityTest.IndexRollback
 pgwrapper_pg_ddl_atomicity-test	PgDdlAtomicitySanityTest.StressTestTableWithIndexRollback
 pgwrapper_pg_ddl_atomicity-test	PgDdlAtomicitySanityTest.TestYsqlTxnStatusReporting
-pgwrapper_pg_ddl_atomicity-test	PgDdlAtomicitySnapshotTest.*
 pgwrapper_pg_ddl_atomicity-test	PgDdlAtomicityTablegroupTest.*
 pgwrapper_pg_ddl_atomicity-test	PgDdlAtomicityTest.*
 pgwrapper_pg_ddl_atomicity-test	PgDdlAtomicityTxnTest.*

diff --git a/src/postgres/src/backend/replication/slotfuncs.c b/src/postgres/src/backend/replication/slotfuncs.c
@@ -393,6 +393,7 @@ pg_get_replication_slots(PG_FUNCTION_ARGS)
 			slot_contents.data.persistency = RS_PERSISTENT;
 			slot_contents.data.invalidated_at = InvalidXLogRecPtr;
 			slot_contents.data.two_phase_at = InvalidXLogRecPtr;
+			slot_contents.data.two_phase = false;
 		}
 		else
 		{

diff --git a/src/postgres/src/interfaces/libpq/Makefile b/src/postgres/src/interfaces/libpq/Makefile
@@ -115,10 +115,11 @@ backend_src = $(top_srcdir)/src/backend
 # Also skip the test on platforms where libpq infrastructure may be provided
 # by statically-linked libraries, as we can't expect them to honor this
 # coding rule.
+# YB: exclude __tsan_func_exit as well for TSAN build.
 libpq-refs-stamp: $(shlib)
 ifneq ($(enable_coverage), yes)
 ifeq (,$(filter aix solaris,$(PORTNAME)))
-	@if nm -A -u $< 2>/dev/null | grep -v __cxa_atexit | grep exit; then \
+	@if nm -A -u $< 2>/dev/null | grep -v '__cxa_atexit\|__tsan_func_exit' | grep exit; then \
 		echo 'libpq must not be calling any function which invokes exit'; exit 1; \
 	fi
 endif