Log add/remove index complete at the same level as when it starts (#121852)

This commit is contained in:
J. Nick Koston 2024-07-12 08:54:38 -05:00 committed by GitHub
parent 6a86cdf3f5
commit ebd50d327b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -333,11 +333,9 @@ def _create_index(
index = index_list[0] index = index_list[0]
_LOGGER.debug("Creating %s index", index_name) _LOGGER.debug("Creating %s index", index_name)
_LOGGER.warning( _LOGGER.warning(
( "Adding index `%s` to table `%s`. Note: this can take several "
"Adding index `%s` to table `%s`. Note: this can take several " "minutes on large databases and slow computers. Please "
"minutes on large databases and slow computers. Please " "be patient!",
"be patient!"
),
index_name, index_name,
table_name, table_name,
) )
@ -351,7 +349,7 @@ def _create_index(
"Index %s already exists on %s, continuing", index_name, table_name "Index %s already exists on %s, continuing", index_name, table_name
) )
_LOGGER.debug("Finished creating %s", index_name) _LOGGER.warning("Finished adding index `%s` to table `%s`", index_name, table_name)
def _execute_or_collect_error( def _execute_or_collect_error(
@ -384,11 +382,9 @@ def _drop_index(
DO NOT USE THIS FUNCTION IN ANY OPERATION THAT TAKES USER INPUT. DO NOT USE THIS FUNCTION IN ANY OPERATION THAT TAKES USER INPUT.
""" """
_LOGGER.warning( _LOGGER.warning(
( "Dropping index `%s` from table `%s`. Note: this can take several "
"Dropping index `%s` from table `%s`. Note: this can take several " "minutes on large databases and slow computers. Please "
"minutes on large databases and slow computers. Please " "be patient!",
"be patient!"
),
index_name, index_name,
table_name, table_name,
) )
@ -397,8 +393,8 @@ def _drop_index(
index_to_drop = get_index_by_name(session, table_name, index_name) index_to_drop = get_index_by_name(session, table_name, index_name)
if index_to_drop is None: if index_to_drop is None:
_LOGGER.debug( _LOGGER.warning(
"The index %s on table %s no longer exists", index_name, table_name "The index `%s` on table `%s` no longer exists", index_name, table_name
) )
return return
@ -415,18 +411,16 @@ def _drop_index(
f"DROP INDEX {index_to_drop}", f"DROP INDEX {index_to_drop}",
): ):
if _execute_or_collect_error(session_maker, query, errors): if _execute_or_collect_error(session_maker, query, errors):
_LOGGER.debug( _LOGGER.warning(
"Finished dropping index %s from table %s", index_name, table_name "Finished dropping index `%s` from table `%s`", index_name, table_name
) )
return return
if not quiet: if not quiet:
_LOGGER.warning( _LOGGER.warning(
( "Failed to drop index `%s` from table `%s`. Schema "
"Failed to drop index `%s` from table `%s`. Schema " "Migration will continue; this is not a "
"Migration will continue; this is not a " "critical operation: %s",
"critical operation: %s"
),
index_name, index_name,
table_name, table_name,
errors, errors,