MDEV-34209 InnoDB is disregarding read-only mode on slow shutdown

dr-m · dr-m · commit ff377d3bea30 · 2024-05-22T08:33:43.000+03:00
innobase_end(): Do not attempt to shrink the system tablespace if innodb_read_only=ON or innodb_force_recovery>4. This fixes a regression due to commit 2d6c2f2 (MDEV-32452). This bug was caught when testing a fix of MDEV-34200, which adds SET GLOBAL innodb_fast_shutdown=0 to the test innodb.undo_upgrade.
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -4262,7 +4262,7 @@ innobase_end(handlerton*, ha_panic_function)
 		}
 
 		/* Do system tablespace truncation during slow shutdown */
-		if (!srv_fast_shutdown
+		if (!srv_fast_shutdown && !high_level_read_only
 		    && srv_operation == SRV_OPERATION_NORMAL) {
 			fsp_system_tablespace_truncate();
 		}

Original file line number	Diff line number	Diff line change
`@@ -4262,7 +4262,7 @@ innobase_end(handlerton*, ha_panic_function)`
`4262`	`4262`	`}`
`4263`	`4263`
`4264`	`4264`	`/* Do system tablespace truncation during slow shutdown */`
`4265`		`- if (!srv_fast_shutdown`
	`4265`	`+ if (!srv_fast_shutdown && !high_level_read_only`
`4266`	`4266`	`&& srv_operation == SRV_OPERATION_NORMAL) {`
`4267`	`4267`	`fsp_system_tablespace_truncate();`
`4268`	`4268`	`}`