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

TASK: Remove obsolete OUTDATED_CONFLICT state leftovers #5143

Open
wants to merge 1 commit into
base: 9.0
Choose a base branch
from

Conversation

mhsdesign
Copy link
Member

@mhsdesign mhsdesign commented Jun 16, 2024

Resolves: #5101

Upgrade instructions

Review instructions

MUST BE CAREFULLY REVIEWED... please dont trust my proposal :D

with #4965 we never create rebase was failed events anymore and the logic to query OUTDATED_CONFLICT workspaces was removed.
To have a consistent and understandable codebase without dead artefacts i removed the OUTDATED_CONFLICT flag and for the legacy event (in case of a replay) OUTDATED will be written to the database as otherwise the workspace will probably disappear and not be to recover

Checklist

  • Code follows the PSR-2 coding style
  • Tests have been created, run and adjusted as needed
  • The PR is created against the lowest maintained branch
  • Reviewer - PR Title is brief but complete and starts with FEATURE|TASK|BUGFIX
  • Reviewer - The first section explains the change briefly for change-logs
  • Reviewer - Breaking Changes are marked with !!! and have upgrade-instructions

Copy link
Contributor

@dlubitz dlubitz left a comment

Choose a reason for hiding this comment

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

Looks good to me by reading.

@pKallert
Copy link
Contributor

Since we remove the OUTDATED_CONFLICT, perhaps the test scenario text here should be adjusted?

Scenario: Conflicting changes lead to OUTDATED_CONFLICT which can be recovered from via forced rebase

@pKallert pKallert self-requested a review June 27, 2024 12:07
@nezaniel
Copy link
Member

this will require a projection:replay if there are workspaces in the then removed state, right?

@mhsdesign
Copy link
Member Author

Without this and outdated-conflict workspace cannot be properly be queryd i guess ... but yes if you happen to have an conflict workspace from before #4965 you might need a replay to fix the state but maybe not. In general i think with beta10 out there a long time its probably neglect able that people have a conflict workspace. This was just meant as simple code cleanup as this is dead code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove WorkspaceStatus::OUTDATED_CONFLICT?
4 participants