Skip to content

worker::git: Read yanked status from database #4175

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 4 commits into from
Nov 15, 2021

Conversation

Turbo87
Copy link
Member

@Turbo87 Turbo87 commented Nov 14, 2021

This PR implements one part of #4172. By no longer passing yanked into the yank (now sync_yanked) background worker task, and instead reading yanked from the database, we can avoid issues from tasks running out of order.

@Turbo87 Turbo87 added C-internal 🔧 Category: Nonessential work that would make the codebase more consistent or clear A-backend ⚙️ labels Nov 14, 2021
@JohnTitor
Copy link
Member

Looks fine 👍 @bors r+

@bors
Copy link
Contributor

bors commented Nov 15, 2021

📌 Commit 51f52cb has been approved by JohnTitor

@bors
Copy link
Contributor

bors commented Nov 15, 2021

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout sync-yanked (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self sync-yanked --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging src/worker/git.rs
CONFLICT (content): Merge conflict in src/worker/git.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Nov 15, 2021

☔ The latest upstream changes (presumably #4173) made this pull request unmergeable. Please resolve the merge conflicts.

We only need the `num` field, so there is no need for us to save the full `Version` in the task payload
This avoids out-of-order issues when previous tasks failed and are retried at the end of the queue.
@Turbo87
Copy link
Member Author

Turbo87 commented Nov 15, 2021

@bors r=JohnTitor

@bors
Copy link
Contributor

bors commented Nov 15, 2021

📌 Commit 552ae26 has been approved by JohnTitor

@bors
Copy link
Contributor

bors commented Nov 15, 2021

⌛ Testing commit 552ae26 with merge aa967aa...

@bors
Copy link
Contributor

bors commented Nov 15, 2021

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing aa967aa to master...

@bors bors merged commit aa967aa into rust-lang:master Nov 15, 2021
@Turbo87 Turbo87 deleted the sync-yanked branch November 15, 2021 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-backend ⚙️ C-internal 🔧 Category: Nonessential work that would make the codebase more consistent or clear
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants