-
Notifications
You must be signed in to change notification settings - Fork 96
Improved reliability of table migration status refresher #1623
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,7 +43,7 @@ def __init__( | |
backend: SqlBackend, | ||
table_mapping: TableMapping, | ||
group_manager: GroupManager, | ||
migration_status_refresher: 'MigrationStatusRefresher', | ||
migration_status_refresher: MigrationStatusRefresher, | ||
principal_grants: PrincipalACL, | ||
): | ||
self._tc = table_crawler | ||
|
@@ -57,7 +57,11 @@ def __init__( | |
self._principal_grants = principal_grants | ||
|
||
def index(self): | ||
# TODO: remove this method | ||
return self._migration_status_refresher.index() | ||
|
||
def _index_with_reset(self): | ||
# when we want the latest up-to-date status, e.g. to determine whether views dependencies have been migrated | ||
self._migration_status_refresher.reset() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. don't reset it here. we use |
||
return self._migration_status_refresher.index() | ||
|
||
def migrate_tables( | ||
|
@@ -116,9 +120,8 @@ def _migrate_tables( | |
|
||
def _migrate_views(self, acl_strategy, all_grants_to_migrate, all_migrated_groups, all_principal_grants): | ||
tables_to_migrate = self._tm.get_tables_to_migrate(self._tc) | ||
self._migration_status_refresher.reset() | ||
all_tasks = [] | ||
sequencer = ViewsMigrationSequencer(tables_to_migrate, self.index()) | ||
sequencer = ViewsMigrationSequencer(tables_to_migrate, self._index_with_reset()) | ||
batches = sequencer.sequence_batches() | ||
for batch in batches: | ||
tasks = [] | ||
|
@@ -134,9 +137,7 @@ def _migrate_views(self, acl_strategy, all_grants_to_migrate, all_migrated_group | |
) | ||
) | ||
Threads.strict("migrate views", tasks) | ||
self._migration_status_refresher.reset() | ||
all_tasks.extend(tasks) | ||
self._migration_status_refresher.reset() | ||
return all_tasks | ||
|
||
def _compute_grants( | ||
|
@@ -201,7 +202,7 @@ def _migrate_view( | |
def _view_can_be_migrated(self, view: ViewToMigrate): | ||
# dependencies have already been computed, therefore an empty dict is good enough | ||
for table in view.dependencies: | ||
if not self.index().get(table.schema, table.name): | ||
if not self._index_with_reset().get(table.schema, table.name): | ||
logger.info(f"View {view.src.key} cannot be migrated because {table.key} is not migrated yet") | ||
return False | ||
return True | ||
|
@@ -219,8 +220,8 @@ def _sql_migrate_view(self, src_view: ViewToMigrate) -> str: | |
# CREATE VIEW x.y (col1, col2) AS SELECT * FROM w.t | ||
create_statement = self._backend.fetch(f"SHOW CREATE TABLE {src_view.src.safe_sql_key}") | ||
src_view.src.view_text = next(iter(create_statement))["createtab_stmt"] | ||
migration_index = self._migration_status_refresher.index() | ||
return src_view.sql_migrate_view(migration_index) | ||
# this does not require the index to be refreshed because the dependencies have already been validated | ||
return src_view.sql_migrate_view(self.index()) | ||
|
||
def _migrate_external_table(self, src_table: Table, rule: Rule, grants: list[Grant] | None = None): | ||
target_table_key = rule.as_uc_table_key | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.