Remove obsolete restriction on the range of log_rotation_size.

tglsfdc · tglsfdc · commit d4c3a6b8ad83 · 2025-01-31T14:36:56.000-05:00
When syslogger.c was first written, we didn't want to assume that all platforms have 64-bit ftello. But we've been assuming that since v13 (cf commit 799d224), so let's use that in syslogger.c and allow log_rotation_size to range up to INT_MAX kilobytes. The old code effectively limited log_rotation_size to 2GB regardless of platform. While nobody's complained, that doesn't seem too far away from what might be thought reasonable these days. I noticed this while searching for instances of "1024L" in connection with commit 041e8b9. These were the last such instances. (We still have instances of L-suffixed literals, but most of them are associated with wait intervals for pg_usleep or similar functions. I don't see any urgent reason to change that.)
diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
@@ -444,19 +444,19 @@ SysLoggerMain(char *startup_data, size_t startup_data_len)
 		if (!rotation_requested && Log_RotationSize > 0 && !rotation_disabled)
 		{
 			/* Do a rotation if file is too big */
-			if (ftell(syslogFile) >= Log_RotationSize * 1024L)
+			if (ftello(syslogFile) >= Log_RotationSize * (pgoff_t) 1024)
 			{
 				rotation_requested = true;
 				size_rotation_for |= LOG_DESTINATION_STDERR;
 			}
 			if (csvlogFile != NULL &&
-				ftell(csvlogFile) >= Log_RotationSize * 1024L)
+				ftello(csvlogFile) >= Log_RotationSize * (pgoff_t) 1024)
 			{
 				rotation_requested = true;
 				size_rotation_for |= LOG_DESTINATION_CSVLOG;
 			}
 			if (jsonlogFile != NULL &&
-				ftell(jsonlogFile) >= Log_RotationSize * 1024L)
+				ftello(jsonlogFile) >= Log_RotationSize * (pgoff_t) 1024)
 			{
 				rotation_requested = true;
 				size_rotation_for |= LOG_DESTINATION_JSONLOG;
@@ -1183,9 +1183,11 @@ pipeThread(void *arg)
 		 */
 		if (Log_RotationSize > 0)
 		{
-			if (ftell(syslogFile) >= Log_RotationSize * 1024L ||
-				(csvlogFile != NULL && ftell(csvlogFile) >= Log_RotationSize * 1024L) ||
-				(jsonlogFile != NULL && ftell(jsonlogFile) >= Log_RotationSize * 1024L))
+			if (ftello(syslogFile) >= Log_RotationSize * (pgoff_t) 1024 ||
+				(csvlogFile != NULL &&
+				 ftello(csvlogFile) >= Log_RotationSize * (pgoff_t) 1024) ||
+				(jsonlogFile != NULL &&
+				 ftello(jsonlogFile) >= Log_RotationSize * (pgoff_t) 1024))
 				SetLatch(MyLatch);
 		}
 		LeaveCriticalSection(&sysloggerSection);
diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c
@@ -3299,7 +3299,7 @@ struct config_int ConfigureNamesInt[] =
 			GUC_UNIT_KB
 		},
 		&Log_RotationSize,
-		10 * 1024, 0, INT_MAX / 1024,
+		10 * 1024, 0, INT_MAX,
 		NULL, NULL, NULL
 	},
 

Original file line number	Diff line number	Diff line change
`@@ -444,19 +444,19 @@ SysLoggerMain(char *startup_data, size_t startup_data_len)`
`444`	`444`	`if (!rotation_requested && Log_RotationSize > 0 && !rotation_disabled)`
`445`	`445`	`{`
`446`	`446`	`/* Do a rotation if file is too big */`
`447`		`- if (ftell(syslogFile) >= Log_RotationSize * 1024L)`
	`447`	`+ if (ftello(syslogFile) >= Log_RotationSize * (pgoff_t) 1024)`
`448`	`448`	`{`
`449`	`449`	`rotation_requested = true;`
`450`	`450`	`size_rotation_for \|= LOG_DESTINATION_STDERR;`
`451`	`451`	`}`
`452`	`452`	`if (csvlogFile != NULL &&`
`453`		`- ftell(csvlogFile) >= Log_RotationSize * 1024L)`
	`453`	`+ ftello(csvlogFile) >= Log_RotationSize * (pgoff_t) 1024)`
`454`	`454`	`{`
`455`	`455`	`rotation_requested = true;`
`456`	`456`	`size_rotation_for \|= LOG_DESTINATION_CSVLOG;`
`457`	`457`	`}`
`458`	`458`	`if (jsonlogFile != NULL &&`
`459`		`- ftell(jsonlogFile) >= Log_RotationSize * 1024L)`
	`459`	`+ ftello(jsonlogFile) >= Log_RotationSize * (pgoff_t) 1024)`
`460`	`460`	`{`
`461`	`461`	`rotation_requested = true;`
`462`	`462`	`size_rotation_for \|= LOG_DESTINATION_JSONLOG;`
`@@ -1183,9 +1183,11 @@ pipeThread(void *arg)`
`1183`	`1183`	`*/`
`1184`	`1184`	`if (Log_RotationSize > 0)`
`1185`	`1185`	`{`
`1186`		`- if (ftell(syslogFile) >= Log_RotationSize * 1024L \|\|`
`1187`		`- (csvlogFile != NULL && ftell(csvlogFile) >= Log_RotationSize * 1024L) \|\|`
`1188`		`- (jsonlogFile != NULL && ftell(jsonlogFile) >= Log_RotationSize * 1024L))`
	`1186`	`+ if (ftello(syslogFile) >= Log_RotationSize * (pgoff_t) 1024 \|\|`
	`1187`	`+ (csvlogFile != NULL &&`
	`1188`	`+ ftello(csvlogFile) >= Log_RotationSize * (pgoff_t) 1024) \|\|`
	`1189`	`+ (jsonlogFile != NULL &&`
	`1190`	`+ ftello(jsonlogFile) >= Log_RotationSize * (pgoff_t) 1024))`
`1189`	`1191`	`SetLatch(MyLatch);`
`1190`	`1192`	`}`
`1191`	`1193`	`LeaveCriticalSection(&sysloggerSection);`