Upadte last written LSN after walloging all createdb stuff (#307)

Co-authored-by: Konstantin Knizhnik <[email protected]>

Author: knizhnik

src/backend/commands/dbcommands.c

@@ -486,8 +486,6 @@ CreateDirAndVersionFile(char *dbpath, Oid dbid, Oid tsid, bool isRedo)
 
 		lsn = XLogInsert(RM_DBASE_ID, XLOG_DBASE_CREATE_WAL_LOG);
 
-		SetLastWrittenLSNForDatabase(lsn);
-
 		/* As always, WAL must hit the disk before the data update does. */
 		XLogFlush(lsn);
 	}
@@ -615,7 +613,6 @@ CreateDatabaseUsingFileCopy(Oid src_dboid, Oid dst_dboid, Oid src_tsid,
 		/* Record the filesystem change in XLOG */
 		{
 			xl_dbase_create_file_copy_rec xlrec;
-			XLogRecPtr lsn;
 
 			xlrec.db_id = dst_dboid;
 			xlrec.tablespace_id = dsttablespace;
@@ -626,10 +623,8 @@ CreateDatabaseUsingFileCopy(Oid src_dboid, Oid dst_dboid, Oid src_tsid,
 			XLogRegisterData((char *) &xlrec,
 							 sizeof(xl_dbase_create_file_copy_rec));
 
-			lsn = XLogInsert(RM_DBASE_ID,
+			(void) XLogInsert(RM_DBASE_ID,
 							  XLOG_DBASE_CREATE_FILE_COPY | XLR_SPECIAL_REL_UPDATE);
-
-			SetLastWrittenLSNForDatabase(lsn);
 		}
 		pfree(srcpath);
 		pfree(dstpath);
@@ -1403,6 +1398,11 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
 			CreateDatabaseUsingFileCopy(src_dboid, dboid, src_deftablespace,
 										dst_deftablespace);
 
+		/*
+		 * Update global last written LSN after wal-logging create database command
+		 */
+		SetLastWrittenLSNForDatabase(XactLastRecEnd);
+
 		/*
 		 * Close pg_database, but keep lock till commit.
 		 */