mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-04 00:02:52 -05:00 
			
		
		
		
	Report any XLogReadRecord() error in XlogReadTwoPhaseData().
Buildfarm members kittiwake and tadarida have witnessed errors at this site. The site discarded key facts. Back-patch to v10 (all supported versions). Reviewed by Michael Paquier and Tom Lane. Discussion: https://postgr.es/m/20211107013157.GB790288@rfd.leadboat.com
This commit is contained in:
		
							parent
							
								
									42f9427aa9
								
							
						
					
					
						commit
						3354746910
					
				@ -1397,10 +1397,18 @@ XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len)
 | 
			
		||||
	record = XLogReadRecord(xlogreader, &errormsg);
 | 
			
		||||
 | 
			
		||||
	if (record == NULL)
 | 
			
		||||
		ereport(ERROR,
 | 
			
		||||
				(errcode_for_file_access(),
 | 
			
		||||
				 errmsg("could not read two-phase state from WAL at %X/%X",
 | 
			
		||||
						LSN_FORMAT_ARGS(lsn))));
 | 
			
		||||
	{
 | 
			
		||||
		if (errormsg)
 | 
			
		||||
			ereport(ERROR,
 | 
			
		||||
					(errcode_for_file_access(),
 | 
			
		||||
					 errmsg("could not read two-phase state from WAL at %X/%X: %s",
 | 
			
		||||
							LSN_FORMAT_ARGS(lsn), errormsg)));
 | 
			
		||||
		else
 | 
			
		||||
			ereport(ERROR,
 | 
			
		||||
					(errcode_for_file_access(),
 | 
			
		||||
					 errmsg("could not read two-phase state from WAL at %X/%X",
 | 
			
		||||
							LSN_FORMAT_ARGS(lsn))));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (XLogRecGetRmid(xlogreader) != RM_XACT_ID ||
 | 
			
		||||
		(XLogRecGetInfo(xlogreader) & XLOG_XACT_OPMASK) != XLOG_XACT_PREPARE)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user