pg_upgrade: report failed cluster name

When pg_upgrade can't find required pg_controldata information, report
_which_ cluster is failing, with this message:

	The %s cluster lacks some required control information:

diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
index 7c80c873153fbac139b37ff3ed04a3b0db6910ec..f4252af4edca2c5f7c2297d472e526bafefb481d 100644 (file)
--- a/contrib/pg_upgrade/controldata.c
+++ b/contrib/pg_upgrade/controldata.c
@@ -477,7 +477,8 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                !got_date_is_int || !got_float8_pass_by_value)
        {
                pg_log(PG_REPORT,
-                       "Some required control information is missing;  cannot find:\n");
+                       "The %s cluster lacks some required control information:\n",
+                       CLUSTER_NAME(cluster));
 
                if (!got_xid)
                        pg_log(PG_REPORT, "  checkpoint next XID\n");