Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[web] Don't run goldctl init more than once #41207

Merged
merged 4 commits into from
Apr 14, 2023

Conversation

mdebbar
Copy link
Contributor

@mdebbar mdebbar commented Apr 14, 2023

From the logs reported in flutter/flutter#124864 I noticed we are making multiple calls to goldctl init which could be causing some race conditions with the goldctl imgtest add calls.

This PR makes sure we only call goldctl init once.

@mdebbar mdebbar requested a review from eyebrowsoffire April 14, 2023 17:09
@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@@ -495,5 +481,12 @@ class SkiaGoldClient {
}
}

Future<void>? _oneResult;
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we can make this a global, it needs to be per SkiaGoldClient. We have separate gold clients per suite now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

Nice catch! I've been contemplating making it per client instead of global but didn't find a good reason to do that. Totally forgot that we run multiple suites at the same time now.

@mdebbar mdebbar requested a review from eyebrowsoffire April 14, 2023 18:13
Copy link
Contributor

@eyebrowsoffire eyebrowsoffire left a comment

Choose a reason for hiding this comment

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

LGTM! One small unimportant nit

@mdebbar mdebbar added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 14, 2023
@auto-submit auto-submit bot merged commit 1ff5495 into flutter:main Apr 14, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 14, 2023
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Apr 14, 2023
…124896)

flutter/engine@413e95d...e9739bc

2023-04-14 chris@bracken.jp [macOS] Build unittests on all macOS host builds (flutter/engine#41215)
2023-04-14 mdebbar@google.com [web] Don't run goldctl init more than once (flutter/engine#41207)
2023-04-14 skia-flutter-autoroll@skia.org Roll Skia from 2bd12e31d578 to 22e417bea884 (4 revisions) (flutter/engine#41213)
2023-04-14 chillers@google.com Revert "[Android] Send connectionClosed message when keyboard becomes invisible to ensure framework focus state is correct." (flutter/engine#41211)
2023-04-14 magder@google.com Remove `Mac mac_android_aot_engine` in favor of Linux (flutter/engine#41210)
2023-04-14 magder@google.com Run clang tidy builds on arm Macs (flutter/engine#41183)
2023-04-14 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from diD1gLr_dKWFJlsSn... to Z0of2S9pf3Zn1nsJP... (flutter/engine#41209)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from diD1gLr_dKWF to Z0of2S9pf3Zn

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC jacksongardner@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
exaby73 pushed a commit to NevercodeHQ/flutter that referenced this pull request Apr 17, 2023
…lutter#124896)

flutter/engine@413e95d...e9739bc

2023-04-14 chris@bracken.jp [macOS] Build unittests on all macOS host builds (flutter/engine#41215)
2023-04-14 mdebbar@google.com [web] Don't run goldctl init more than once (flutter/engine#41207)
2023-04-14 skia-flutter-autoroll@skia.org Roll Skia from 2bd12e31d578 to 22e417bea884 (4 revisions) (flutter/engine#41213)
2023-04-14 chillers@google.com Revert "[Android] Send connectionClosed message when keyboard becomes invisible to ensure framework focus state is correct." (flutter/engine#41211)
2023-04-14 magder@google.com Remove `Mac mac_android_aot_engine` in favor of Linux (flutter/engine#41210)
2023-04-14 magder@google.com Run clang tidy builds on arm Macs (flutter/engine#41183)
2023-04-14 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from diD1gLr_dKWFJlsSn... to Z0of2S9pf3Zn1nsJP... (flutter/engine#41209)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from diD1gLr_dKWF to Z0of2S9pf3Zn

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC jacksongardner@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@mdebbar mdebbar deleted the gold_one_init branch June 22, 2023 21:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
autosubmit Merge PR when tree becomes green via auto submit App needs tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants