fix gpupgrade with tablespace

Author: lss602726449

aclocal.m4

@@ -26,7 +26,7 @@ USAGE() {
     echo ""
 }
 
-PORT_BASE=${PORT_BASE:=7000}
+PORT_BASE=${PORT_BASE:=10000}
 NUM_PRIMARY_MIRROR_PAIRS=${NUM_PRIMARY_MIRROR_PAIRS:=3}
 if [ "${NUM_PRIMARY_MIRROR_PAIRS}" -eq "0" ]; then
   BLDWRAP_POSTGRES_CONF_ADDONS="fsync=on ${BLDWRAP_POSTGRES_CONF_ADDONS}"  # always enable fsync if singlenode

gpAux/gpdemo/gpdemo-defaults.sh

@@ -20,6 +20,7 @@
 #include "catalog/pg_class.h"
 #include "catalog/pg_enum.h"
 #include "catalog/pg_namespace.h"
+#include "catalog/pg_tablespace.h"
 #include "catalog/pg_type.h"
 #include "cdb/cdbvars.h"
 #include "commands/extension.h"
@@ -38,6 +39,19 @@ do {															\
 				 errmsg("function can only be called when server is in binary upgrade mode"))); \
 } while (0)
 
+Datum
+binary_upgrade_set_next_pg_tablespace_oid(PG_FUNCTION_ARGS)
+{
+	Oid			tablespaceoid = PG_GETARG_OID(0);
+	char	   *tablespacename = GET_STR(PG_GETARG_TEXT_P(1));
+
+	CHECK_IS_BINARY_UPGRADE;
+	AddPreassignedOidFromBinaryUpgrade(tablespaceoid, TableSpaceRelationId, tablespacename,
+						InvalidOid, InvalidOid, InvalidOid);
+
+	PG_RETURN_VOID();
+}
+
 Datum
 binary_upgrade_set_next_pg_type_oid(PG_FUNCTION_ARGS)
 {

src/backend/utils/adt/pg_upgrade_support.c

@@ -184,6 +184,18 @@ typedef struct _dumpOptions
 	int			do_nothing;
 } DumpOptions;
 
+
+typedef enum
+{
+	Greenplum,
+	Cloudberry
+} DatabaseType;
+
+typedef struct
+{
+	DatabaseType type;
+	int version;
+} DatabaseVersion;
 /*
  *	We may want to have some more user-readable data, but in the mean
  *	time this gives us some abstraction and type checking.
@@ -216,6 +228,8 @@ typedef struct Archive
 	bool		exit_on_error;	/* whether to exit on SQL errors... */
 	int			n_errors;		/* number of errors (if no die) */
 
+	DatabaseVersion version;
+
 	/* The rest is private */
 } Archive;
 

src/bin/pg_dump/pg_backup.h

@@ -35,6 +35,10 @@ _check_database_version(ArchiveHandle *AH)
 	const char *remoteversion_str;
 	int			remoteversion;
 	PGresult   *res;
+	char	   *version;
+	char		dbstring[1024];
+	char		dbstring2[1024];
+	int			v1;
 
 	remoteversion_str = PQparameterStatus(AH->connection, "server_version");
 	remoteversion = PQserverVersion(AH->connection);
@@ -68,6 +72,29 @@ _check_database_version(ArchiveHandle *AH)
 	}
 	else
 		AH->public.isStandby = false;
+
+	ExecuteSqlQueryForSingleRow((Archive *) AH, "SELECT version()");
+
+	version = PQgetvalue(res, 0, 0);
+
+	if(sscanf(version, "%*[^(](%s %s %d.%*d.%*d-%*[^)])", dbstring, dbstring2, &v1) != 3)
+		pg_log_error("could not get version output from select version();\n");
+
+	if (strcasecmp("Greenplum", dbstring) == 0 && strcasecmp("Database", dbstring2) == 0)
+	{
+		AH->public.version.type = Greenplum;
+		AH->public.version.version = v1;
+
+	} else if((strcasecmp("Cloudberry", dbstring) == 0 && strcasecmp("Database", dbstring2) == 0)
+				|| (strcasecmp("Apache", dbstring) == 0 && strcasecmp("Cloudberry", dbstring2) == 0))
+	{
+		AH->public.version.type = Cloudberry;
+		AH->public.version.version = v1;
+	}
+	else
+		pg_log_error("could not upgrade from non Greenplum/Cloudberry version: %s %s\n", dbstring, dbstring2);
+
+	PQclear(res);
 }
 
 /*

src/bin/pg_dump/pg_backup_db.c

@@ -928,8 +928,6 @@ main(int argc, char **argv)
 	/* Let the archiver know how noisy to be */
 	fout->verbose = g_verbose;
 
-	pg_log_info("123");
-
 
 	/*
 	 * We allow the server to be back to 8.3, and up to any minor release of
@@ -947,8 +945,6 @@ main(int argc, char **argv)
 	ConnectDatabase(fout, &dopt.cparams, false, dopt.binary_upgrade);
 	setup_connection(fout, dumpencoding, dumpsnapshot, use_role);
 
-		pg_log_info("123");
-
 	/*
 	 * Determine whether or not we're interacting with a GP backend.
 	 */
@@ -973,8 +969,6 @@ main(int argc, char **argv)
 			break;
 	}
 
-	pg_log_info("123");
-
 	/*
 	 * Disable security label support if server version < v9.1.x (prevents
 	 * access to nonexistent pg_seclabel catalog)
@@ -7347,7 +7341,7 @@ getTables(Archive *fout, int *numTables)
 	int			i_amname;
 	int			i_amoid;
 	int			i_isivm;
-	// int			i_isdynamic;
+	int			i_isdynamic;
 
 	/*
 	 * Find all the tables and table-like objects.
@@ -7468,8 +7462,8 @@ getTables(Archive *fout, int *numTables)
 						  "%s AS partkeydef, "
 						  "%s AS ispartition, "
 						  "%s AS partbound, "
-						  "c.relisivm AS isivm "
-						//   "c.relisdynamic AS isdynamic "
+						  "c.relisivm AS isivm, "
+						  "%s"
 						  "FROM pg_class c "
 						  "LEFT JOIN pg_depend d ON "
 						  "(c.relkind = '%c' AND "
@@ -7499,6 +7493,7 @@ getTables(Archive *fout, int *numTables)
 						  partkeydef,
 						  ispartition,
 						  partbound,
+						  (fout->version.type == Cloudberry && fout->version.version >= 2) ? "c.relisdynamic AS isdynamic " : "false AS isdynamic ",
 						  RELKIND_SEQUENCE,
 						  RELKIND_PARTITIONED_TABLE,
 						  RELKIND_RELATION, RELKIND_SEQUENCE,
@@ -7992,7 +7987,7 @@ getTables(Archive *fout, int *numTables)
 	i_amname = PQfnumber(res, "amname");
 	i_amoid = PQfnumber(res, "amoid");
 	i_isivm = PQfnumber(res, "isivm");
-	// i_isdynamic = PQfnumber(res, "isdynamic");
+	i_isdynamic = PQfnumber(res, "isdynamic");
 
 	if (dopt->lockWaitTimeout)
 	{
@@ -8127,7 +8122,7 @@ getTables(Archive *fout, int *numTables)
 		tblinfo[i].ispartition = (strcmp(PQgetvalue(res, i, i_ispartition), "t") == 0);
 		tblinfo[i].partbound = pg_strdup(PQgetvalue(res, i, i_partbound));
 		tblinfo[i].isivm = (strcmp(PQgetvalue(res, i, i_isivm), "t") == 0);
-		// tblinfo[i].isdynamic = (strcmp(PQgetvalue(res, i, i_isdynamic), "t") == 0);
+		tblinfo[i].isdynamic = (strcmp(PQgetvalue(res, i, i_isdynamic), "t") == 0);
 
 		/* foreign server */
 		tblinfo[i].foreign_server = atooid(PQgetvalue(res, i, i_foreignserver));

src/bin/pg_dump/pg_dump.c

@@ -1759,6 +1759,12 @@ dumpTablespaces(PGconn *conn)
 		/* needed for buildACLCommands() */
 		fspcname = pg_strdup(fmtId(spcname));
 
+		if (binary_upgrade)
+		{
+			appendPQExpBufferStr(buf, "\n-- For binary upgrade, must preserve pg_tablespace oid\n");
+			appendPQExpBuffer(buf, "SELECT pg_catalog.binary_upgrade_set_next_pg_tablespace_oid('%u'::pg_catalog.oid, '%s'::text);\n", spcoid, spcname);
+		}
+
 		appendPQExpBuffer(buf, "CREATE TABLESPACE %s", spcname);
 		appendPQExpBuffer(buf, " OWNER %s", fmtId(spcowner));
 

src/bin/pg_dump/pg_dumpall.c

@@ -576,7 +576,7 @@ check_for_new_tablespace_dir(ClusterInfo *new_cluster)
 				 os_info.old_tablespaces[tblnum],
 				 new_cluster->tablespace_suffix);
 
-		if (stat(new_tablespace_dir, &statbuf) == 0 || errno != ENOENT)
+		if (is_greenplum_dispatcher_mode() && (stat(new_tablespace_dir, &statbuf) == 0 || errno != ENOENT))
 			gp_fatal_log("new cluster tablespace directory already exists: \"%s\"\n",
 					 new_tablespace_dir);
 	}

src/bin/pg_upgrade/check.c

@@ -59,6 +59,7 @@ static void copy_xact_xlog_xid(void);
 static void set_frozenxids(bool minmxid_only);
 static void make_outputdirs(char *pgdata);
 static void setup(char *argv0, bool *live_check);
+static void get_cluster_version(ClusterInfo *cluster, bool live_check);
 
 static void copy_subdir_files(const char *old_subdir, const char *new_subdir);
 
@@ -170,6 +171,9 @@ main(int argc, char **argv)
 		umask(pg_mode_mask);
 	}
 
+	get_cluster_version(&old_cluster, live_check);
+	get_cluster_version(&new_cluster, live_check);
+
 
 	check_and_dump_old_cluster(live_check, &sequence_script_file_name);
 
@@ -304,6 +308,74 @@ main(int argc, char **argv)
 	return 0;
 }
 
+
+void
+get_cluster_version(ClusterInfo *cluster, bool live_check)
+{
+	PGconn	   *conn;
+	PGresult   *res;
+	char		query[QUERY_ALLOC];
+	char	   *version;
+	int			i_version;
+	int			ntups;
+	int			dbid;
+	int			i_dbid;
+	char		dbstring[MAX_STRING];
+	char		dbstring2[MAX_STRING];
+	int			v1;
+
+	start_postmaster(cluster, false);
+
+	conn = connectToServer(cluster, "template1");
+
+	snprintf(query, sizeof(query), "SELECT version()");
+
+	res = executeQueryOrDie(conn, "%s", query);
+
+	i_version = PQfnumber(res, "version");
+
+	ntups = PQntuples(res);
+	Assert(ntups == 1);
+
+	version = PQgetvalue(res, 0, i_version);
+
+	if(sscanf(version, "%*[^(](%s %s %d.%*d.%*d-%*[^)])", dbstring, dbstring2, &v1) != 3)
+		pg_fatal("could not get version output from select version();\n");
+
+	if (strcasecmp("Greenplum", dbstring) == 0 && strcasecmp("Database", dbstring2) == 0)
+	{
+		cluster->version.type = Greenplum;
+		cluster->version.version = v1;
+
+	} else if((strcasecmp("Cloudberry", dbstring) == 0 && strcasecmp("Database", dbstring2) == 0)
+				|| (strcasecmp("Apache", dbstring) == 0 && strcasecmp("Cloudberry", dbstring2) == 0))
+	{
+		cluster->version.type = Cloudberry;
+		cluster->version.version = v1;
+	}
+	else
+		pg_fatal("could not upgrade from non Greenplum/Cloudberry version: %s %s\n", dbstring, dbstring2);
+
+	res = executeQueryOrDie(conn, "%s", "show gp_dbid;");
+
+	i_dbid = PQfnumber(res, "gp_dbid");
+
+	ntups = PQntuples(res);
+	Assert(ntups == 1);
+
+	dbid = atoi(PQgetvalue(res, 0, i_dbid));
+
+	cluster->dbid = dbid;
+
+	PQclear(res);
+
+	PQfinish(conn);
+
+	stop_postmaster(cluster);
+
+	return;
+}
+
 #ifdef WIN32
 typedef BOOL(WINAPI * __CreateRestrictedToken) (HANDLE, DWORD, DWORD, PSID_AND_ATTRIBUTES, DWORD, PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE);
 

src/bin/pg_upgrade/pg_upgrade.c

@@ -351,6 +351,18 @@ typedef enum
 
 typedef long pgpid_t;
 
+typedef enum
+{
+	Greenplum,
+	Cloudberry
+} DatabaseType;
+
+typedef struct
+{
+	DatabaseType type;
+	int version;
+} DatabaseVersion;
+
 
 /*
  * cluster
@@ -373,6 +385,8 @@ typedef struct
 	char		major_version_str[64];	/* string PG_VERSION of cluster */
 	uint32		bin_version;	/* version returned from pg_ctl */
 	const char *tablespace_suffix;	/* directory specification */
+	DatabaseVersion version;
+	int32		dbid;
 } ClusterInfo;