BUG#30239255 CLONE FAILS ON JUST UPGRADED SERVER FROM 5.7

BUG#30602218 CLONE PLUGIN MISUNDERSTANDING UNDO TABLE-SPACE FILE NAME

Problem :
---------
Upgrade leaves orphan in-memory tablespaces for the 5.7 undo tablespaces.

Solution :
----------
While upgrading undo tablespace, remove the tablespace completely instead
of just deleting the files.

Patch is based on contribution from Satya Bodapati <[email protected]>
Thanks to Satya and Percona for this patch.

Reviewed-by: Kevin Lewis <[email protected]>

RB: 23497

Author: Debarun Banerjee

share/messages_to_error_log.txt

@@ -10650,6 +10650,9 @@ ER_IB_MSG_DICT_PARTITION_NOT_FOUND
 ER_ACCESS_DENIED_FOR_USER_ACCOUNT_BLOCKED_BY_PASSWORD_LOCK
   eng "Access denied for user '%-.48s'@'%-.64s'. Account is blocked for %s day(s) (%s day(s) remaining) due to %u consecutive failed logins. Use FLUSH PRIVILEGES or ALTER USER to reset."
 
+ER_INNODB_OUT_OF_RESOURCES
+  eng "%s"
+
 ER_DD_UPGRADE_FOUND_PREPARED_XA_TRANSACTION
   eng "Upgrade cannot proceed due to an existing prepared XA transaction."
 
@@ -10659,6 +10662,9 @@ ER_MIGRATE_TABLE_TO_DD_OOM
 ER_RPL_RELAY_LOG_RECOVERY_INFO_AFTER_CLONE
   eng "Relay log information for channel '%s' was found after a clone operation. Relay log recovery will be executed to adjust positions and file information for this new server. Should that automatic procedure fail please adjust the positions through 'CHANGE MASTER TO'"
 
+ER_IB_MSG_57_UNDO_SPACE_DELETE_FAIL
+  eng "Failed to delete 5.7 undo tablespace: %s during upgrade"
+
 # DO NOT add server-to-client messages here;
 # they go in messages_to_clients.txt
 # in the same directory as this file.

storage/innobase/srv/srv0start.cc

@@ -1361,8 +1361,11 @@ dberr_t srv_undo_tablespaces_upgrade() {
 
     fil_space_close(undo_space.id());
 
-    os_file_delete_if_exists(innodb_data_file_key, undo_space.file_name(),
-                             NULL);
+    auto err = fil_delete_tablespace(undo_space.id(), BUF_REMOVE_ALL_NO_WRITE);
+
+    if (err != DB_SUCCESS) {
+      ib::warn(ER_IB_MSG_57_UNDO_SPACE_DELETE_FAIL, undo_space.space_name());
+    }
   }
 
   /* Remove the tracking of these undo tablespaces from TRX_SYS page and