[CF 6139] v7 - Invalid primary_slot_name triggers warnings in all processes on reload

This branch was automatically generated by a robot using patches from an
email thread registered at:

https://commitfest.postgresql.org/patch/6139

The branch will be overwritten each time a new patch version is posted to
the thread, and also periodically to check for bitrot caused by changes
on the master branch.

Patch(es): https://www.postgresql.org/message-id/CAHGQGwHJxhaQQ7bf_wPBYBTJO+X+rK_-znsgay_kYm2ncJYAGQ@mail.gmail.com
Author(s): Fujii Masao

Author: Commitfest Bot

src/backend/access/transam/xlogrecovery.c

@@ -4769,10 +4769,16 @@ check_primary_slot_name(char **newval, void **extra, GucSource source)
 		!ReplicationSlotValidateNameInternal(*newval, false, &err_code,
 											 &err_msg, &err_hint))
 	{
+		/*
+		 * Use GUC_check_errdetail_internal() and GUC_check_errhint_internal()
+		 * instead of GUC_check_errdetail() and GUC_check_errhint(), since the
+		 * messages from ReplicationSlotValidateNameInternal() are already
+		 * translated. This avoids double translation.
+		 */
 		GUC_check_errcode(err_code);
-		GUC_check_errdetail("%s", err_msg);
+		GUC_check_errdetail_internal("%s", err_msg);
 		if (err_hint != NULL)
-			GUC_check_errhint("%s", err_hint);
+			GUC_check_errhint_internal("%s", err_hint);
 		return false;
 	}
 

src/backend/utils/error/elog.c

@@ -1692,6 +1692,37 @@ format_elog_string(const char *fmt,...)
 	return edata->message;
 }
 
+/*
+ * This is exactly like format_elog_string() except that strings passed to
+ * format_elog_string_internal are not translated, and are customarily left
+ * out of the internationalization message dictionary. This should be used
+ * when the passed strings have already been translated.
+ */
+char *
+format_elog_string_internal(const char *fmt,...)
+{
+	ErrorData	errdata;
+	ErrorData  *edata;
+	MemoryContext oldcontext;
+
+	/* Initialize a mostly-dummy error frame */
+	edata = &errdata;
+	MemSet(edata, 0, sizeof(ErrorData));
+	/* the default text domain is the backend's */
+	edata->domain = save_format_domain ? save_format_domain : PG_TEXTDOMAIN("postgres");
+	/* set the errno to be used to interpret %m */
+	edata->saved_errno = save_format_errnumber;
+
+	oldcontext = MemoryContextSwitchTo(ErrorContext);
+
+	edata->message_id = fmt;
+	EVALUATE_MESSAGE(edata->domain, message, false, false);
+
+	MemoryContextSwitchTo(oldcontext);
+
+	return edata->message;
+}
+
 
 /*
  * Actual output of the top-of-stack error message

src/include/utils/elog.h

@@ -302,6 +302,7 @@ extern void errsave_finish(struct Node *context,
 
 extern void pre_format_elog_string(int errnumber, const char *domain);
 extern char *format_elog_string(const char *fmt,...) pg_attribute_printf(1, 2);
+extern char *format_elog_string_internal(const char *fmt,...) pg_attribute_printf(1, 2);
 
 
 /* Support for attaching context information to error reports */

src/include/utils/guc.h

@@ -510,4 +510,22 @@ extern void GUC_check_errcode(int sqlerrcode);
 	pre_format_elog_string(errno, TEXTDOMAIN), \
 	GUC_check_errhint_string = format_elog_string
 
+/*
+ * These are exactly like GUC_check_errmsg/errdtail/errhint except that
+ * strings passed to them are not translated, and are customarily left
+ * out of the internationalization message dictionary. This should be used
+ * when the passed strings have already been translated.
+ */
+#define GUC_check_errmsg_internal \
+	pre_format_elog_string(errno, TEXTDOMAIN), \
+	GUC_check_errmsg_string = format_elog_string_internal
+
+#define GUC_check_errdetail_internal \
+	pre_format_elog_string(errno, TEXTDOMAIN), \
+	GUC_check_errdetail_string = format_elog_string_internal
+
+#define GUC_check_errhint_internal \
+	pre_format_elog_string(errno, TEXTDOMAIN), \
+	GUC_check_errhint_string = format_elog_string_internal
+
 #endif							/* GUC_H */