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

pageserver: revert concurrent secondary downloads #7866

Merged
merged 2 commits into from
May 24, 2024

Conversation

jcsp
Copy link
Contributor

@jcsp jcsp commented May 23, 2024

Problem

Ongoing hunt for secondary location shutdown hang issues.

Summary of changes

  • Revert the functional changes from pageserver: use adaptive concurrency in secondary layer downloads #7675
  • Tweak a log in secondary downloads to make it more apparent when we drop out on cancellation
  • Modify DownloadStream's behavior to always return an Err after it has been cancelled. This should not impact anything, but it makes the behavior simpler to reason about (e.g. even if the poll function somehow got called again, it could never end up in an un-cancellable state)

Related #https://github.com/neondatabase/cloud/issues/13576

Checklist before requesting a review

  • I have performed a self-review of my code.
  • If it is a core feature, I have added thorough tests.
  • Do we need to implement analytics? if so did you add the relevant metrics to the dashboard?
  • If this PR requires public announcement, mark it with /release-notes label and add several sentences in this section.

Checklist before merging

  • Do not forget to reformat commit message to not include the above checklist

@jcsp jcsp added t/bug Issue Type: Bug c/storage/pageserver Component: storage: pageserver labels May 23, 2024
@jcsp jcsp changed the title Jcsp/secondary command hangs pageserver: revert concurrent secondary downloads, make DownloadStream always yield Err after cancel May 23, 2024
Copy link

github-actions bot commented May 23, 2024

3114 tests run: 2987 passed, 0 failed, 127 skipped (full report)


Flaky tests (1)

Postgres 16

  • test_statvfs_pressure_usage: release

Code coverage* (full report)

  • functions: 31.4% (6443 of 20532 functions)
  • lines: 48.3% (49787 of 103138 lines)

* collected from Rust tests only


The comment gets automatically updated with the latest test results
263f2a8 at 2024-05-24T08:49:01.203Z :recycle:

@jcsp jcsp marked this pull request as ready for review May 23, 2024 17:11
@jcsp jcsp requested a review from a team as a code owner May 23, 2024 17:11
@jcsp jcsp requested a review from koivunej May 23, 2024 17:11
Copy link
Member

@koivunej koivunej left a comment

Choose a reason for hiding this comment

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

Let's just revert, no additional changes.

jcsp added 2 commits May 24, 2024 07:55
…oads`

AKA Pull request #7675

This partially reverts commit 5f0fbdf.  We keep the part of that PR that
refactored download_layer into a function.
@jcsp jcsp force-pushed the jcsp/secondary-command-hangs branch from 547602f to 263f2a8 Compare May 24, 2024 07:55
@jcsp
Copy link
Contributor Author

jcsp commented May 24, 2024

Let's just revert, no additional changes.

I've trimmed this PR to just the revert & secondary mode log change.

@jcsp jcsp requested a review from koivunej May 24, 2024 07:56
@jcsp jcsp enabled auto-merge (squash) May 24, 2024 07:56
@jcsp jcsp changed the title pageserver: revert concurrent secondary downloads, make DownloadStream always yield Err after cancel pageserver: revert concurrent secondary downloads May 24, 2024
@jcsp jcsp merged commit 1455f5a into main May 24, 2024
61 of 62 checks passed
@jcsp jcsp deleted the jcsp/secondary-command-hangs branch May 24, 2024 08:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c/storage/pageserver Component: storage: pageserver t/bug Issue Type: Bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants