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

WIP: Refactor relaunch process on mac #15257

Closed
wants to merge 1 commit into from

Conversation

simonhong
Copy link
Member

fix brave/brave-browser#25576

Resolves

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@simonhong simonhong self-assigned this Sep 28, 2022
@github-actions github-actions bot added the potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false label Sep 28, 2022

namespace chrome {

void AttemptRestart() {

Choose a reason for hiding this comment

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

What about RelaunchIgnoreUnloadHandlers?

Choose a reason for hiding this comment

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

I wonder why not add the code only once in AttemptRestartInternal. I also wonder whether the code in AttemptRestartInternal is necessary before the Sparkle relaunch. For example, this line:

  // Set the flag to restore state after the restart.
  pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, true);

https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/lifetime/application_lifetime_desktop.cc;l=124?q=AttemptRestartInternal&ss=chromium%2Fchromium%2Fsrc

@mihaiplesa mihaiplesa added the CI/skip Do not run CI builds (except noplatform) label Mar 7, 2023
SparkleGlue* sparkle_glue = [SparkleGlue sharedSparkleGlue];
// Only relaunch via sparkle when update is available.
if ([sparkle_glue recentStatus] == kAutoupdateInstalled) {
[sparkle_glue relaunch];
Copy link
Member

@goodov goodov Mar 17, 2023

Choose a reason for hiding this comment

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

is there a reason to do this via sparkle? why can't we always restart via chromium's AttemptRestart() call?

It looks like this restart is pretty crazy for chromium (it kills the process in a non-chromium friendly way). I think the right thing here should be is to do this sparkle call as the last step in AttemptRestartInternal (put this condition there).

Because we don't call AttemptRestartInternal() currently on MacOS updates (via Settings/Hamburger), we may lose sessions, break local state/prefs and all other crazy things.

For example, right now this task is failing on MacOS most likely because prefs::kWasRestarted is not set during the restart triggered via a manual "Relaunch" click on brave://settings/help.

@simonhong we need to resurrect this PR and make it work as intended. I'll be happy to review it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sparkle relaunch was introduced for fixing brave/brave-browser#1787.
When asking relaunch to sparkle, not sure but I think sparkle does its things and sends normal quit signals as you investigated.
Yeah, doing it as a last step of AttemptRestartInternal() could be more better 👍🏼

Copy link
Member

Choose a reason for hiding this comment

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

Sparkle relaunch was introduced for fixing brave/brave-browser#1787. When asking relaunch to sparkle, not sure but I think sparkle does its things and sends normal quit signals as you investigated. Yeah, doing it as a last step of AttemptRestartInternal() could be more better 👍🏼

well, we might have fixed one issue (or maybe just hid it under the rug), but created another one.

@bsclifton
Copy link
Member

Closing as stale. @simonhong please re-open if we'd like to attempt this fix again. Thanks! 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip Do not run CI builds (except noplatform) potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unexpected behavior after relaunch (macOS)
5 participants