MDEV-34374 Shrinking tablespace logic fails to handle error condition

Thirunarayanan · Thirunarayanan · commit b40f9d3d5c5d · 2024-06-12T17:36:12.000+05:30
- InnoDB ignores the error while traversing the used
extents during shrinking process. Made changes in
fsp_traverse_extents() to handle error condition
correctly
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc
@@ -3465,10 +3465,10 @@ dberr_t fsp_traverse_extents(
   else
   {
     err= old_xdes_entry->insert(0, mtr);
-    if (err) return err;
-    if (threshold & (srv_page_size - 1))
+    if (err == DB_SUCCESS && threshold & (srv_page_size - 1))
       err= old_xdes_entry->insert(
         xdes_calc_descriptor_page(0, threshold), mtr);
+    if (err) return err;
   }
 
   buf_block_t *block= nullptr;

Original file line number	Diff line number	Diff line change
`@@ -3465,10 +3465,10 @@ dberr_t fsp_traverse_extents(`
`3465`	`3465`	`else`
`3466`	`3466`	`{`
`3467`	`3467`	`err= old_xdes_entry->insert(0, mtr);`
`3468`		`- if (err) return err;`
`3469`		`- if (threshold & (srv_page_size - 1))`
	`3468`	`+ if (err == DB_SUCCESS && threshold & (srv_page_size - 1))`
`3470`	`3469`	`err= old_xdes_entry->insert(`
`3471`	`3470`	`xdes_calc_descriptor_page(0, threshold), mtr);`
	`3471`	`+ if (err) return err;`
`3472`	`3472`	`}`
`3473`	`3473`
`3474`	`3474`	`buf_block_t *block= nullptr;`