Skip to content
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

T257301: Add conflicts warning in layer-update #127

Merged
merged 8 commits into from
Jun 11, 2024

Conversation

viktordick
Copy link
Collaborator

No description provided.

Wiseqube
Wiseqube previously approved these changes May 22, 2024
Copy link
Contributor

@Wiseqube Wiseqube left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

jan-jockusch
jan-jockusch previously approved these changes May 23, 2024
Copy link
Member

@jan-jockusch jan-jockusch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -74,6 +74,12 @@ def run(self):
return

self._playback_paths(sorted(paths))
self.sync.record(sorted(paths), recurse=False)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not work in dry-run mode (the rollback already happened and not all paths are found) and even without it, I get a lot of errors that paths can't be recorded because they don't exist aymore (with skip_errors=True, it still works, but the output is not pretty).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this whole plan does not work well with dry-run. For now, I will only do the re-record and conflict check in non-dry-run mode. Otherwise we would need to do the re-record before the rollback and also roll back the changes done by this on the file system. Which will be difficult if there are multiple phases...

@viktordick viktordick dismissed stale reviews from jan-jockusch and Wiseqube via d1944b9 May 29, 2024 06:43
@viktordick
Copy link
Collaborator Author

Something is still not right here...
I got some warning when applying the new layer to our DEV system, but not all of the mentioned paths even exist in the custom layer.

@viktordick
Copy link
Collaborator Author

Ready for review again. Had to track down some more errors that the live test revealed.

Copy link
Contributor

@Wiseqube Wiseqube left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@viktordick viktordick merged commit ff45ab3 into master Jun 11, 2024
3 checks passed
@viktordick viktordick deleted the 257301-warn-layer-update branch June 11, 2024 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants