Fix sys.dm_exec_sessions having rows for backends which are already t…

…erminated (#3329) We initialize and keep a local status array which has the entries for all TDS connections but we did not reset these entries during connection abort or shmem exit of the backend, which means future read of this local status array will see these entries as valid. As a fix, mark the status entry as invalid during proc/shmem exit Task: [BABEL-5414] Signed-off-by: Tanzeel Khan [email protected]
babelfish-for-postgresql · Dec 30, 2024 · df1ce4d · df1ce4d
1 parent da9d1da
commit df1ce4d
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 17 deletions.
diff --git a/contrib/babelfishpg_tds/src/backend/tds/tds.c b/contrib/babelfishpg_tds/src/backend/tds/tds.c
@@ -155,7 +155,7 @@ typedef struct LocalTdsStatus
 } LocalTdsStatus;
 
 static TdsStatus *TdsStatusArray = NULL;
-static TdsStatus *MyTdsStatusEntry;
+static TdsStatus *MyTdsStatusEntry = NULL;
 static LocalTdsStatus *localTdsStatusTable = NULL;
 
 uint32_t	MyTdsClientVersion = 0;
@@ -446,9 +446,17 @@ tds_stats_shmem_shutdown(int code, Datum arg)
 		return;
 
 	/* Safety check ... shouldn't get here unless shmem is set up. */
-	if (TdsStatusArray == NULL)
+	if (TdsStatusArray == NULL || MyTdsStatusEntry == NULL)
 		return;
 
+	PGSTAT_BEGIN_WRITE_ACTIVITY(MyTdsStatusEntry);
+
+	MyTdsStatusEntry->st_procpid = 0;	/* mark invalid */
+
+	PGSTAT_END_WRITE_ACTIVITY(MyTdsStatusEntry);
+
+	MyTdsStatusEntry = NULL;
+
 	return;
 }
 

diff --git a/test/JDBC/upgrade/13_6/schedule b/test/JDBC/upgrade/13_6/schedule
@@ -199,7 +199,7 @@ sys-datefirst
 sys-dm_exec_connections
 sys-dm_exec_connections-dep
 sys-dm_exec_sessions
-#sys-dm_exec_sessions-dep TODO:BABEL-5414
+sys-dm_exec_sessions-dep
 sys-dm_hadr_cluster
 sys-dm_hadr_database_replica_states
 sys-dm_os_host_info

diff --git a/test/JDBC/upgrade/13_9/schedule b/test/JDBC/upgrade/13_9/schedule
@@ -195,7 +195,7 @@ sys-datefirst
 sys-dm_exec_connections
 sys-dm_exec_connections-dep
 sys-dm_exec_sessions
-#sys-dm_exec_sessions-dep TODO:BABEL-5414
+sys-dm_exec_sessions-dep
 sys-dm_hadr_cluster
 sys-dm_hadr_database_replica_states
 sys-dm_os_host_info

diff --git a/test/JDBC/upgrade/14_12/schedule b/test/JDBC/upgrade/14_12/schedule
@@ -60,7 +60,7 @@ column_domain_usage
 constraint_column_usage
 select-strip-parens-before-15_5
 sp_describe_first_result_set
-#sys-host_name-before-15_8-or-16_4 TODO:BABEL-5414
+sys-host_name-before-15_8-or-16_4
 SYSTEM_USER
 indexproperty
 sys-all_parameters
@@ -241,7 +241,7 @@ sys-index_columns-dep
 sys-sp_databases-dep
 sys-syscolumns-dep
 sys-dm_exec_connections-dep
-#sys-dm_exec_sessions-dep TODO:BABEL-5414
+sys-dm_exec_sessions-dep
 sys-table_types-before-dep
 sys-all_sql_modules-dep_before_16_5
 sys-sql_modules-dep_before_16_5

diff --git a/test/JDBC/upgrade/14_15/schedule b/test/JDBC/upgrade/14_15/schedule
@@ -60,7 +60,7 @@ column_domain_usage
 constraint_column_usage
 select-strip-parens-before-15_5
 sp_describe_first_result_set
-#sys-host_name-before-15_8-or-16_4 TODO:BABEL-5414
+sys-host_name-before-15_8-or-16_4
 SYSTEM_USER
 indexproperty
 sys-all_parameters
@@ -241,7 +241,7 @@ sys-index_columns-dep
 sys-sp_databases-dep
 sys-syscolumns-dep
 sys-dm_exec_connections-dep
-#sys-dm_exec_sessions-dep TODO:BABEL-5414
+sys-dm_exec_sessions-dep
 sys-table_types-before-dep
 sys-all_sql_modules-dep_before_16_5
 sys-sql_modules-dep_before_16_5

diff --git a/test/JDBC/upgrade/14_16/schedule b/test/JDBC/upgrade/14_16/schedule
@@ -60,7 +60,7 @@ column_domain_usage
 constraint_column_usage
 select-strip-parens-before-15_5
 sp_describe_first_result_set
-#sys-host_name-before-15_8-or-16_4 TODO:BABEL-5414
+sys-host_name-before-15_8-or-16_4
 SYSTEM_USER
 indexproperty
 sys-all_parameters
@@ -241,7 +241,7 @@ sys-index_columns-dep
 sys-sp_databases-dep
 sys-syscolumns-dep
 sys-dm_exec_connections-dep
-#sys-dm_exec_sessions-dep TODO:BABEL-5414
+sys-dm_exec_sessions-dep
 sys-table_types-before-dep
 sys-all_sql_modules-dep_before_16_5
 sys-sql_modules-dep_before_16_5

diff --git a/test/JDBC/upgrade/14_3/schedule b/test/JDBC/upgrade/14_3/schedule
@@ -209,7 +209,7 @@ sys-datefirst
 sys-dm_exec_connections
 sys-dm_exec_connections-dep
 sys-dm_exec_sessions
-#sys-dm_exec_sessions-dep TODO:BABEL-5414
+sys-dm_exec_sessions-dep
 sys-dm_hadr_cluster
 sys-dm_hadr_database_replica_states
 sys-dm_os_host_info

diff --git a/test/JDBC/upgrade/14_5/schedule b/test/JDBC/upgrade/14_5/schedule
@@ -215,7 +215,7 @@ sys-datefirst
 sys-dm_exec_connections
 sys-dm_exec_connections-dep
 sys-dm_exec_sessions
-#sys-dm_exec_sessions-dep TODO:BABEL-5414
+sys-dm_exec_sessions-dep
 sys-dm_hadr_cluster
 sys-dm_hadr_database_replica_states
 sys-dm_os_host_info
@@ -237,7 +237,7 @@ sys-fulltext_stoplists
 sys-hash_indexes
 sys-has_perms_by_name
 sys-has_perms_by_name-dep
-#sys-host_name-before-15_8-or-16_4 TODO:BABEL-5414
+sys-host_name-before-15_8-or-16_4
 sys-identity_columns
 sys-identity_columns-dep
 sys-index_columns

diff --git a/test/JDBC/upgrade/14_6/schedule b/test/JDBC/upgrade/14_6/schedule
@@ -248,7 +248,7 @@ sys-default_constraints-dep
 sys-dm_exec_connections
 sys-dm_exec_connections-dep
 sys-dm_exec_sessions
-#sys-dm_exec_sessions-dep TODO:BABEL-5414
+sys-dm_exec_sessions-dep
 sys-dm_hadr_cluster
 sys-dm_hadr_database_replica_states
 sys-dm_os_host_info
@@ -270,7 +270,7 @@ sys-fulltext_stoplists
 sys-hash_indexes
 sys-has_perms_by_name
 sys-has_perms_by_name-dep
-#sys-host_name-before-15_8-or-16_4 TODO:BABEL-5414
+sys-host_name-before-15_8-or-16_4
 sys-identity_columns
 sys-identity_columns-dep
 sys-index_columns

diff --git a/test/JDBC/upgrade/15_2/schedule b/test/JDBC/upgrade/15_2/schedule
@@ -271,7 +271,7 @@ sys-default_constraints-dep
 sys-dm_exec_connections
 sys-dm_exec_connections-dep
 sys-dm_exec_sessions
-#sys-dm_exec_sessions-dep TODO:BABEL-5414
+sys-dm_exec_sessions-dep
 sys-dm_hadr_cluster
 sys-dm_hadr_database_replica_states
 sys-dm_os_host_info
@@ -293,7 +293,7 @@ sys-fulltext_stoplists
 sys-hash_indexes
 sys-has_perms_by_name
 sys-has_perms_by_name-dep
-#sys-host_name-before-15_8-or-16_4 TODO:BABEL-5414
+sys-host_name-before-15_8-or-16_4
 sys-identity_columns
 sys-identity_columns-dep
 sys-index_columns