Online upgrade

Author: knizhnik

src/backend/libpq/pqcomm.c

@@ -503,6 +503,17 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber,
 				closesocket(fd);
 				continue;
 			}
+			if ((setsockopt(fd, SOL_SOCKET, SO_REUSEPORT,
+							(char *) &one, sizeof(one))) == -1)
+			{
+				ereport(LOG,
+						(errcode_for_socket_access(),
+				/* translator: first %s is IPv4, IPv6, or Unix */
+						 errmsg("setsockopt(SO_REUSEADDR) failed for %s address \"%s\": %m",
+								familyDesc, addrDesc)));
+				closesocket(fd);
+				continue;
+			}
 		}
 #endif
 

src/backend/port/sysv_shmem.c

@@ -125,7 +125,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size)
 	IpcMemoryId shmid;
 	void	   *requestedAddress = NULL;
 	void	   *memAddress;
-
+	int         mode = IPC_CREAT | IPC_EXCL | IPCProtection;
 	/*
 	 * Normally we just pass requestedAddress = NULL to shmat(), allowing the
 	 * system to choose where the segment gets mapped.  But in an EXEC_BACKEND
@@ -143,14 +143,16 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size)
 		if (pg_shmem_addr)
 			requestedAddress = (void *) strtoul(pg_shmem_addr, NULL, 0);
 	}
+	if (IsOnlineUpgrade)
+	{
+		mode &= ~IPC_EXCL;
+	}
 #endif
 
-	shmid = shmget(memKey, size, IPC_CREAT | IPC_EXCL | IPCProtection);
-
+	shmid = shmget(memKey, size, mode);
 	if (shmid < 0)
 	{
 		int			shmget_errno = errno;
-
 		/*
 		 * Fail quietly if error indicates a collision with existing segment.
 		 * One would expect EEXIST, given that we said IPC_EXCL, but perhaps
@@ -175,7 +177,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size)
 		 */
 		if (shmget_errno == EINVAL)
 		{
-			shmid = shmget(memKey, 0, IPC_CREAT | IPC_EXCL | IPCProtection);
+			shmid = shmget(memKey, 0, mode);
 
 			if (shmid < 0)
 			{
@@ -216,7 +218,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size)
 				(errmsg("could not create shared memory segment: %m"),
 				 errdetail("Failed system call was shmget(key=%lu, size=%zu, 0%o).",
 						   (unsigned long) memKey, size,
-						   IPC_CREAT | IPC_EXCL | IPCProtection),
+						   mode),
 				 (shmget_errno == EINVAL) ?
 				 errhint("This error usually means that PostgreSQL's request for a shared memory "
 						 "segment exceeded your kernel's SHMMAX parameter, or possibly that "
@@ -241,7 +243,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size)
 	}
 
 	/* Register on-exit routine to delete the new segment */
-	on_shmem_exit(IpcMemoryDelete, Int32GetDatum(shmid));
+	//on_shmem_exit(IpcMemoryDelete, Int32GetDatum(shmid));
 
 	/* OK, should be able to attach to the segment */
 	memAddress = shmat(shmid, requestedAddress, PG_SHMAT_FLAGS);
@@ -752,6 +754,11 @@ PGSharedMemoryCreate(Size size,
 
 	/* Initialize new segment. */
 	hdr = (PGShmemHeader *) memAddress;
+
+	*shim = hdr;
+	if (IsOnlineUpgrade)
+		return hdr;
+
 	hdr->creatorPID = getpid();
 	hdr->magic = PGShmemMagic;
 	hdr->dsm_control = 0;
@@ -765,7 +772,6 @@ PGSharedMemoryCreate(Size size,
 	 */
 	hdr->totalsize = size;
 	hdr->freeoffset = MAXALIGN(sizeof(PGShmemHeader));
-	*shim = hdr;
 
 	/* Save info for possible future use */
 	UsedShmemSegAddr = memAddress;
@@ -806,7 +812,7 @@ PGSharedMemoryReAttach(void)
 	void	   *origUsedShmemSegAddr = UsedShmemSegAddr;
 
 	Assert(UsedShmemSegAddr != NULL);
-	Assert(IsUnderPostmaster);
+	Assert(IsUnderPostmaster || IsOnlineUpgrade);
 
 #ifdef __CYGWIN__
 	/* cygipc (currently) appears to not detach on exec. */

src/backend/postmaster/postmaster.c

@@ -391,7 +391,7 @@ static void pmdie(SIGNAL_ARGS);
 static void reaper(SIGNAL_ARGS);
 static void sigusr1_handler(SIGNAL_ARGS);
 static void startup_die(SIGNAL_ARGS);
-static void dummy_handler(SIGNAL_ARGS);
+static void upgrade_handler(SIGNAL_ARGS);
 static void StartupPacketTimeoutHandler(void);
 static void CleanupBackend(int pid, int exitstatus);
 static bool CleanupBackgroundWorker(int pid, int exitstatus);
@@ -560,6 +560,48 @@ int			postmaster_alive_fds[2] = {-1, -1};
 HANDLE		PostmasterHandle;
 #endif
 
+static void
+UpgradePostgres(void)
+{
+	char* PostmasterArgs[] = {"/home/knizhnik/postgresql/dist/bin/postgres", "-U", "-D", "." ,NULL};
+	BackendParameters param;
+	FILE	   *fp;
+
+	if (!save_backend_variables(&param, NULL))
+		return;				/* log made by save_backend_variables */
+
+	/* Open file */
+	fp = AllocateFile("postmaster.params", PG_BINARY_W);
+	if (!fp)
+	{
+		ereport(LOG,
+				(errcode_for_file_access(),
+				 errmsg("could not create file \"postmaster.params\": %m")));
+		return;
+	}
+
+	if (fwrite(&param, sizeof(param), 1, fp) != 1)
+	{
+		ereport(LOG,
+				(errcode_for_file_access(),
+				 errmsg("could not write to file \"postmaster.params\": %m")));
+		FreeFile(fp);
+		return;
+	}
+
+	/* Release file */
+	if (FreeFile(fp))
+	{
+		ereport(LOG,
+				(errcode_for_file_access(),
+				 errmsg("could not write to file \"postmaster.params\": %m")));
+		return;
+	}
+
+	elog(LOG, "Upgrade postgres");
+	execv(PostmasterArgs[0], PostmasterArgs);
+}
+
 /*
  * Postmaster main entry point
  */
@@ -634,9 +676,10 @@ PostmasterMain(int argc, char *argv[])
 	pqsignal(SIGPIPE, SIG_IGN); /* ignored */
 	pqsignal_no_restart(SIGUSR1, sigusr1_handler);	/* message from child
 													 * process */
-	pqsignal_no_restart(SIGUSR2, dummy_handler);	/* unused, reserve for
+	pqsignal_no_restart(SIGUSR2, upgrade_handler);	/* unused, reserve for
 													 * children */
 	pqsignal_no_restart(SIGCHLD, reaper);	/* handle child termination */
+	pqsignal_no_restart(SIGCHLD, reaper);	/* handle child termination */
 
 	/*
 	 * No other place in Postgres should touch SIGTTIN/SIGTTOU handling.  We
@@ -669,13 +712,16 @@ PostmasterMain(int argc, char *argv[])
 	 * tcop/postgres.c (the option sets should not conflict) and with the
 	 * common help() function in main/main.c.
 	 */
-	while ((opt = getopt(argc, argv, "B:bc:C:D:d:EeFf:h:ijk:lN:nOo:Pp:r:S:sTt:W:-:")) != -1)
+	while ((opt = getopt(argc, argv, "B:bc:C:D:d:EeFf:h:ijk:lN:nOo:Pp:r:S:sTt:UW:-:")) != -1)
 	{
 		switch (opt)
 		{
 			case 'B':
 				SetConfigOption("shared_buffers", optarg, PGC_POSTMASTER, PGC_S_ARGV);
 				break;
+		  	case 'U':
+			  	IsOnlineUpgrade = true;
+				break;
 
 			case 'b':
 				/* Undocumented flag used for binary upgrades */
@@ -853,6 +899,10 @@ PostmasterMain(int argc, char *argv[])
 		ExitPostmaster(1);
 	}
 
+	if (IsOnlineUpgrade)
+		read_backend_variables("postmaster.params", NULL);
+
+
 	/*
 	 * Locate the proper configuration files and data directory, and read
 	 * postgresql.conf for the first time.
@@ -950,7 +1000,8 @@ PostmasterMain(int argc, char *argv[])
 	 * so it must happen before opening sockets so that at exit, the socket
 	 * lockfiles go away after CloseServerPorts runs.
 	 */
-	CreateDataDirLockFile(true);
+	if (!IsOnlineUpgrade)
+		CreateDataDirLockFile(true);
 
 	/*
 	 * Read the control file (for error checking and config info).
@@ -991,12 +1042,16 @@ PostmasterMain(int argc, char *argv[])
 	 * Now that loadable modules have had their chance to register background
 	 * workers, calculate MaxBackends.
 	 */
-	InitializeMaxBackends();
+	if (!IsOnlineUpgrade)
+		InitializeMaxBackends();
 
 	/*
 	 * Set up shared memory and semaphores.
 	 */
-	reset_shared();
+	if (IsOnlineUpgrade)
+		PGSharedMemoryReAttach();
+	else
+		reset_shared();
 
 	/*
 	 * Estimate number of openable files.  This must happen after setting up
@@ -4980,6 +5035,10 @@ SubPostmasterMain(int argc, char *argv[])
 		/* And run the backend */
 		BackendRun(&port);		/* does not return */
 	}
+	if (strcmp(argv[1], "--forkpostmaster") == 0)
+	{
+		InitShmemAccess(UsedShmemSegAddr);
+	}
 	if (strcmp(argv[1], "--forkboot") == 0)
 	{
 		/* Restore basic shared memory pointers */
@@ -5296,8 +5355,9 @@ startup_die(SIGNAL_ARGS)
  * tcop/postgres.c.)
  */
 static void
-dummy_handler(SIGNAL_ARGS)
+upgrade_handler(SIGNAL_ARGS)
 {
+	UpgradePostgres();
 }
 
 /*
@@ -6079,10 +6139,12 @@ save_backend_variables(BackendParameters *param, Port *port,
 					   HANDLE childProcess, pid_t childPid)
 #endif
 {
-	memcpy(&param->port, port, sizeof(Port));
-	if (!write_inheritable_socket(&param->portsocket, port->sock, childPid))
-		return false;
-
+	if (port)
+	{
+		memcpy(&param->port, port, sizeof(Port));
+		if (!write_inheritable_socket(&param->portsocket, port->sock, childPid))
+			return false;
+	}
 	strlcpy(param->DataDir, DataDir, MAXPGPATH);
 
 	memcpy(&param->ListenSocket, &ListenSocket, sizeof(ListenSocket));
@@ -6316,9 +6378,11 @@ read_backend_variables(char *id, Port *port)
 static void
 restore_backend_variables(BackendParameters *param, Port *port)
 {
-	memcpy(port, &param->port, sizeof(Port));
-	read_inheritable_socket(&port->sock, &param->portsocket);
-
+	if (port)
+	{
+		memcpy(port, &param->port, sizeof(Port));
+		read_inheritable_socket(&port->sock, &param->portsocket);
+	}
 	SetDataDir(param->DataDir);
 
 	memcpy(&ListenSocket, &param->ListenSocket, sizeof(ListenSocket));

src/backend/storage/ipc/ipci.c

@@ -194,7 +194,7 @@ CreateSharedMemoryAndSemaphores(void)
 	/*
 	 * Set up shared memory allocation mechanism
 	 */
-	if (!IsUnderPostmaster)
+	if (!IsUnderPostmaster && !IsOnlineUpgrade)
 		InitShmemAllocation();
 
 	/*

src/backend/storage/ipc/shmem.c

@@ -383,7 +383,7 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr)
 		/* Must be trying to create/attach to ShmemIndex itself */
 		Assert(strcmp(name, "ShmemIndex") == 0);
 
-		if (IsUnderPostmaster)
+		if (IsUnderPostmaster || IsOnlineUpgrade)
 		{
 			/* Must be initializing a (non-standalone) backend */
 			Assert(shmemseghdr->index != NULL);

src/backend/utils/init/globals.c

@@ -108,6 +108,7 @@ pid_t		PostmasterPid = 0;
 bool		IsPostmasterEnvironment = false;
 bool		IsUnderPostmaster = false;
 bool		IsBinaryUpgrade = false;
+bool		IsOnlineUpgrade = false;
 bool		IsBackgroundWorker = false;
 
 bool		ExitOnAnyError = false;

src/common/exec.c

@@ -169,6 +169,8 @@ find_my_exec(const char *argv0, char *retpath)
 	 * Since no explicit path was supplied, the user must have been relying on
 	 * PATH.  We'll search the same PATH.
 	 */
+	path = getenv("PATH");
+	Assert(path != NULL);
 	if ((path = getenv("PATH")) && *path)
 	{
 		char	   *startp = NULL,
@@ -195,7 +197,6 @@ find_my_exec(const char *argv0, char *retpath)
 				join_path_components(retpath, retpath, argv0);
 			}
 			canonicalize_path(retpath);
-
 			switch (validate_exec(retpath))
 			{
 				case 0:			/* found ok */
@@ -210,7 +211,6 @@ find_my_exec(const char *argv0, char *retpath)
 			}
 		} while (*endp);
 	}
-
 	log_error(errcode(ERRCODE_UNDEFINED_FILE),
 			  _("could not find a \"%s\" to execute"), argv0);
 	return -1;

src/include/miscadmin.h

@@ -150,6 +150,7 @@ extern PGDLLIMPORT bool IsPostmasterEnvironment;
 extern PGDLLIMPORT bool IsUnderPostmaster;
 extern PGDLLIMPORT bool IsBackgroundWorker;
 extern PGDLLIMPORT bool IsBinaryUpgrade;
+extern PGDLLIMPORT bool IsOnlineUpgrade;
 
 extern PGDLLIMPORT bool ExitOnAnyError;