Set application_name to make shardman deadlock detector happy.

arssher · arssher · commit 863471e08af3 · 2019-06-25T10:57:01.000+03:00
Also port postgres_fdw.use_repeatable_read guc.
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
@@ -451,23 +451,24 @@ static void
 begin_remote_xact(ConnCacheEntry *entry)
 {
 	int			curlevel = GetCurrentTransactionNestLevel();
+	char		sql[128];
+
 
 	/* Start main transaction if we haven't yet */
 	if (entry->xact_depth <= 0)
 	{
-		const char *sql;
-
 		elog(DEBUG3, "starting remote transaction on connection %p",
 			 entry->conn);
 
 		if (UseGlobalSnapshots && (!IsolationUsesXactSnapshot() ||
 								   IsolationIsSerializable()))
 			elog(ERROR, "Global snapshots support only REPEATABLE READ");
 
-		if (IsolationIsSerializable())
-			sql = "START TRANSACTION ISOLATION LEVEL SERIALIZABLE";
-		else
-			sql = "START TRANSACTION ISOLATION LEVEL REPEATABLE READ";
+
+		sprintf(sql, "START TRANSACTION %s; set application_name='pgfdw:%lld:%d';",
+				IsolationIsSerializable() ? "ISOLATION LEVEL SERIALIZABLE" :
+				UseRepeatableRead ? "ISOLATION LEVEL REPEATABLE READ" : "",
+				(long long) GetSystemIdentifier(), MyProcPid);
 
 		entry->changing_xact_state = true;
 		do_sql_command(entry->conn, sql);
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
@@ -273,6 +273,7 @@ typedef struct
 } ec_member_foreign_arg;
 
 bool		UseGlobalSnapshots;
+bool		UseRepeatableRead;
 void		_PG_init(void);
 
 /*
@@ -5911,4 +5912,8 @@ _PG_init(void)
 							 "Use global snapshots for FDW transactions", NULL,
 							 &UseGlobalSnapshots, false, PGC_USERSET, 0, NULL,
 							 NULL, NULL);
+	DefineCustomBoolVariable("postgres_fdw.use_repeatable_read",
+							 "Use repeatable read isilation error for remote transactions", NULL,
+							 &UseRepeatableRead, true, PGC_USERSET, 0, NULL,
+							 NULL, NULL);
 }
diff --git a/contrib/postgres_fdw/postgres_fdw.h b/contrib/postgres_fdw/postgres_fdw.h
@@ -187,6 +187,7 @@ extern const char *get_jointype_name(JoinType jointype);
 extern bool is_builtin(Oid objectId);
 extern bool is_shippable(Oid objectId, Oid classId, PgFdwRelationInfo *fpinfo);
 
+extern bool UseRepeatableRead;
 extern bool UseGlobalSnapshots;
 
 #endif							/* POSTGRES_FDW_H */
