fix: async GAV rebuild drops commits during in-flight rebuild#3670
Conversation
When ASYNCHRONOUS update mode had a rebuild in progress, subsequent commit notifications were silently discarded. Added asyncRebuildNeeded flag so a follow-up rebuild is triggered after the current one completes, and updated awaitReady() to loop until no pending rebuilds remain. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Summary of ChangesHello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request resolves a critical data consistency issue in Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Changelog
Activity
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
🧪 CI InsightsHere's what we observed from your CI run for df1cc4d. 🟢 All jobs passed!But CI Insights is watching 👀 |
Code ReviewThe core idea — using an Bug:
|
| Severity | Item |
|---|---|
| Bug | awaitReady busy-spins until timeout when a rebuild fails (STALE status) |
| Minor | Micro-busy-wait window between latch.countDown() and new latch creation |
| Nit | Missing comment on intentional volatile read of asyncRebuildNeeded outside lock |
The STALE spin-until-timeout is the only change I'd consider required before merging. Everything else looks solid.
There was a problem hiding this comment.
Code Review
This pull request correctly addresses an issue where commits were dropped during an asynchronous GAV rebuild by introducing a flag to queue a subsequent rebuild. The logic for chaining rebuilds appears sound. However, the updated awaitReady() method introduces a potential concurrency issue: it can enter a busy-wait loop, consuming high CPU, while waiting for the next rebuild to be scheduled. I've suggested a fix to address this by yielding the thread in that specific transient state.
| public boolean awaitReady(final long timeout, final TimeUnit unit) { | ||
| if (status == Status.READY) | ||
| return true; | ||
| final long deadlineNanos = System.nanoTime() + unit.toNanos(timeout); | ||
| try { | ||
| if (!readyLatch.await(timeout, unit)) | ||
| return false; | ||
| // Loop to handle follow-up rebuilds triggered by asyncRebuildNeeded. | ||
| // Each rebuild creates a new latch, so we re-read the field after each wait. | ||
| while (status != Status.READY || asyncRebuildNeeded) { | ||
| final long remainingNanos = deadlineNanos - System.nanoTime(); | ||
| if (remainingNanos <= 0) | ||
| return false; | ||
| final CountDownLatch latch = readyLatch; | ||
| if (latch == null) | ||
| return status == Status.READY && !asyncRebuildNeeded; | ||
| if (!latch.await(remainingNanos, TimeUnit.NANOSECONDS)) | ||
| return false; | ||
| } | ||
| } catch (final InterruptedException e) { | ||
| Thread.currentThread().interrupt(); | ||
| return false; | ||
| } | ||
| return status == Status.READY; | ||
| return true; | ||
| } |
There was a problem hiding this comment.
The updated awaitReady method has a potential for a busy-wait spin. If a rebuild completes and another one is needed (asyncRebuildNeeded is true), this method can loop continuously on an already counted-down latch until the next rebuild is scheduled by another thread. This can lead to high CPU usage.
To fix this, we can check if the latch is already open (getCount() == 0). If it is, and the waiting condition is still met, we should Thread.yield() to prevent a tight loop and allow the other thread to schedule the next build.
public boolean awaitReady(final long timeout, final TimeUnit unit) {
final long deadlineNanos = System.nanoTime() + unit.toNanos(timeout);
try {
// Loop to handle follow-up rebuilds triggered by asyncRebuildNeeded.
// Each rebuild creates a new latch, so we re-read the field after each wait.
while (status != Status.READY || asyncRebuildNeeded) {
final long remainingNanos = deadlineNanos - System.nanoTime();
if (remainingNanos <= 0)
return false;
final CountDownLatch latch = readyLatch;
if (latch == null)
return status == Status.READY && !asyncRebuildNeeded;
// If latch is already open, we are in a transient state waiting for the next build.
// Yield to avoid a busy-wait spin while the other thread sets up the new latch.
if (latch.getCount() == 0) {
Thread.yield();
continue;
}
if (!latch.await(remainingNanos, TimeUnit.NANOSECONDS))
return false;
}
} catch (final InterruptedException e) {
Thread.currentThread().interrupt();
return false;
}
return true;
}- Exit loop immediately when status is STALE (failed rebuild) instead of spinning on a zero-count latch until deadline - Add comment explaining intentional volatile read of asyncRebuildNeeded outside the monitor in the finally block Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
|
Addressed review feedback in df1cc4d: Fixed:
Not addressed (by design):
All 121 |
Coverage summary from CodacySee diff coverage on Codacy
Coverage variation details
Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: Diff coverage details
Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: See your quality gate settings Change summary preferences |
(cherry picked from commit 3c04b86)
…[skip ci] Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.18.0 to 5.19.0. Release notes *Sourced from [org.mockito:mockito-core's releases](https://github.com/mockito/mockito/releases).* > v5.19.0 > ------- > > *Changelog generated by [Shipkit Changelog Gradle Plugin](https://github.com/shipkit/shipkit-changelog)* > > #### 5.19.0 > > * 2025-08-15 - [37 commit(s)](mockito/mockito@v5.18.0...v5.19.0) by Adrian-Kim, Tim van der Lippe, Tran Ngoc Nhan, dependabot[bot], juyeop > * feat: Add support for JDK21 Sequenced Collections. [([ArcadeData#3708](https://redirect.github.com/mockito/mockito/issues/3708))]([mockito/mockito#3708](https://redirect.github.com/mockito/mockito/pull/3708)) > * Bump actions/checkout from 4 to 5 [([ArcadeData#3707](https://redirect.github.com/mockito/mockito/issues/3707))]([mockito/mockito#3707](https://redirect.github.com/mockito/mockito/pull/3707)) > * build: Allow overriding 'Created-By' for reproducible builds [([ArcadeData#3704](https://redirect.github.com/mockito/mockito/issues/3704))]([mockito/mockito#3704](https://redirect.github.com/mockito/mockito/pull/3704)) > * Bump org.assertj:assertj-core from 3.27.3 to 3.27.4 [([ArcadeData#3703](https://redirect.github.com/mockito/mockito/issues/3703))]([mockito/mockito#3703](https://redirect.github.com/mockito/mockito/pull/3703)) > * Bump androidx.test:runner from 1.6.2 to 1.7.0 [([ArcadeData#3697](https://redirect.github.com/mockito/mockito/issues/3697))]([mockito/mockito#3697](https://redirect.github.com/mockito/mockito/pull/3697)) > * Bump org.junit.platform:junit-platform-launcher from 1.13.3 to 1.13.4 [([ArcadeData#3694](https://redirect.github.com/mockito/mockito/issues/3694))]([mockito/mockito#3694](https://redirect.github.com/mockito/mockito/pull/3694)) > * Bump com.diffplug.spotless:spotless-plugin-gradle from 7.1.0 to 7.2.1 [([ArcadeData#3693](https://redirect.github.com/mockito/mockito/issues/3693))]([mockito/mockito#3693](https://redirect.github.com/mockito/mockito/pull/3693)) > * Bump junit-jupiter from 5.13.3 to 5.13.4 [([ArcadeData#3691](https://redirect.github.com/mockito/mockito/issues/3691))]([mockito/mockito#3691](https://redirect.github.com/mockito/mockito/pull/3691)) > * Bump com.gradle.develocity from 4.0.2 to 4.1 [([ArcadeData#3689](https://redirect.github.com/mockito/mockito/issues/3689))]([mockito/mockito#3689](https://redirect.github.com/mockito/mockito/pull/3689)) > * Bump com.google.googlejavaformat:google-java-format from 1.27.0 to 1.28.0 [([ArcadeData#3688](https://redirect.github.com/mockito/mockito/issues/3688))]([mockito/mockito#3688](https://redirect.github.com/mockito/mockito/pull/3688)) > * Bump com.google.googlejavaformat:google-java-format from 1.25.2 to 1.27.0 [([ArcadeData#3686](https://redirect.github.com/mockito/mockito/issues/3686))]([mockito/mockito#3686](https://redirect.github.com/mockito/mockito/pull/3686)) > * Bump com.diffplug.spotless:spotless-plugin-gradle from 7.0.4 to 7.1.0 [([ArcadeData#3685](https://redirect.github.com/mockito/mockito/issues/3685))]([mockito/mockito#3685](https://redirect.github.com/mockito/mockito/pull/3685)) > * Bump junit-jupiter from 5.13.2 to 5.13.3 [([ArcadeData#3684](https://redirect.github.com/mockito/mockito/issues/3684))]([mockito/mockito#3684](https://redirect.github.com/mockito/mockito/pull/3684)) > * Bump org.shipkit:shipkit-auto-version from 2.1.0 to 2.1.2 [([ArcadeData#3683](https://redirect.github.com/mockito/mockito/issues/3683))]([mockito/mockito#3683](https://redirect.github.com/mockito/mockito/pull/3683)) > * Bump com.diffplug.spotless:spotless-plugin-gradle from 7.0.2 to 7.0.4 [([ArcadeData#3682](https://redirect.github.com/mockito/mockito/issues/3682))]([mockito/mockito#3682](https://redirect.github.com/mockito/mockito/pull/3682)) > * Only run release after both Java and Android tests have finished > [([ArcadeData#3681](https://redirect.github.com/mockito/mockito/issues/3681))]([mockito/mockito#3681](https://redirect.github.com/mockito/mockito/pull/3681)) > * Bump org.junit.platform:junit-platform-launcher from 1.12.2 to 1.13.3 [([ArcadeData#3680](https://redirect.github.com/mockito/mockito/issues/3680))]([mockito/mockito#3680](https://redirect.github.com/mockito/mockito/pull/3680)) > * Bump org.codehaus.groovy:groovy from 3.0.24 to 3.0.25 [([ArcadeData#3679](https://redirect.github.com/mockito/mockito/issues/3679))]([mockito/mockito#3679](https://redirect.github.com/mockito/mockito/pull/3679)) > * Bump org.eclipse.platform:org.eclipse.osgi from 3.23.0 to 3.23.100 [([ArcadeData#3678](https://redirect.github.com/mockito/mockito/issues/3678))]([mockito/mockito#3678](https://redirect.github.com/mockito/mockito/pull/3678)) > * Can no longer publish snapshot releases [([ArcadeData#3677](https://redirect.github.com/mockito/mockito/issues/3677))]([mockito/mockito#3677](https://redirect.github.com/mockito/mockito/issues/3677)) > * Update Gradle to 8.14.2 [([ArcadeData#3676](https://redirect.github.com/mockito/mockito/issues/3676))]([mockito/mockito#3676](https://redirect.github.com/mockito/mockito/pull/3676)) > * Bump errorprone from 2.23.0 to 2.39.0 [([ArcadeData#3674](https://redirect.github.com/mockito/mockito/issues/3674))]([mockito/mockito#3674](https://redirect.github.com/mockito/mockito/pull/3674)) > * Correct Junit docs link [([ArcadeData#3672](https://redirect.github.com/mockito/mockito/issues/3672))]([mockito/mockito#3672](https://redirect.github.com/mockito/mockito/pull/3672)) > * Bump net.ltgt.gradle:gradle-errorprone-plugin from 4.1.0 to 4.3.0 [([ArcadeData#3670](https://redirect.github.com/mockito/mockito/issues/3670))]([mockito/mockito#3670](https://redirect.github.com/mockito/mockito/pull/3670)) > * Bump junit-jupiter from 5.13.1 to 5.13.2 [([ArcadeData#3669](https://redirect.github.com/mockito/mockito/issues/3669))]([mockito/mockito#3669](https://redirect.github.com/mockito/mockito/pull/3669)) > * Bump bytebuddy from 1.17.5 to 1.17.6 [([ArcadeData#3668](https://redirect.github.com/mockito/mockito/issues/3668))]([mockito/mockito#3668](https://redirect.github.com/mockito/mockito/pull/3668)) > * Bump junit-jupiter from 5.12.2 to 5.13.1 [([ArcadeData#3666](https://redirect.github.com/mockito/mockito/issues/3666))]([mockito/mockito#3666](https://redirect.github.com/mockito/mockito/pull/3666)) > * Bump org.jetbrains.kotlin:kotlin-stdlib from 2.0.21 to 2.2.0 [([ArcadeData#3665](https://redirect.github.com/mockito/mockito/issues/3665))]([mockito/mockito#3665](https://redirect.github.com/mockito/mockito/pull/3665)) > * Bump org.gradle.toolchains.foojay-resolver-convention from 0.9.0 to 1.0.0 [([ArcadeData#3661](https://redirect.github.com/mockito/mockito/issues/3661))]([mockito/mockito#3661](https://redirect.github.com/mockito/mockito/pull/3661)) > * Bump org.junit.platform:junit-platform-launcher from 1.11.4 to 1.12.2 [([ArcadeData#3660](https://redirect.github.com/mockito/mockito/issues/3660))]([mockito/mockito#3660](https://redirect.github.com/mockito/mockito/pull/3660)) > * Add JDK21 sequenced collections for ReturnsEmptyValues [([ArcadeData#3659](https://redirect.github.com/mockito/mockito/issues/3659))]([mockito/mockito#3659](https://redirect.github.com/mockito/mockito/issues/3659)) > * Bump com.gradle.develocity from 3.19.1 to 4.0.2 [([ArcadeData#3658](https://redirect.github.com/mockito/mockito/issues/3658))]([mockito/mockito#3658](https://redirect.github.com/mockito/mockito/pull/3658)) > * Bump ru.vyarus:gradle-animalsniffer-plugin from 1.7.2 to 2.0.1 [([ArcadeData#3657](https://redirect.github.com/mockito/mockito/issues/3657))]([mockito/mockito#3657](https://redirect.github.com/mockito/mockito/pull/3657)) > * Bump org.eclipse.platform:org.eclipse.osgi from 3.22.0 to 3.23.0 [([ArcadeData#3656](https://redirect.github.com/mockito/mockito/issues/3656))]([mockito/mockito#3656](https://redirect.github.com/mockito/mockito/pull/3656)) > * Bump org.codehaus.groovy:groovy from 3.0.23 to 3.0.24 [([ArcadeData#3655](https://redirect.github.com/mockito/mockito/issues/3655))]([mockito/mockito#3655](https://redirect.github.com/mockito/mockito/pull/3655)) > * Bump junit-jupiter from 5.11.4 to 5.12.2 [([ArcadeData#3653](https://redirect.github.com/mockito/mockito/issues/3653))]([mockito/mockito#3653](https://redirect.github.com/mockito/mockito/pull/3653)) > * Reproducible Build: need to inject JDK distribution details to rebuild [([ArcadeData#3563](https://redirect.github.com/mockito/mockito/issues/3563))]([mockito/mockito#3563](https://redirect.github.com/mockito/mockito/issues/3563)) Commits * [`144751b`](mockito/mockito@144751b) Add support for JDK21 Sequenced Collections. ([ArcadeData#3708](https://redirect.github.com/mockito/mockito/issues/3708)) * [`b275c7d`](mockito/mockito@b275c7d) Bump actions/checkout from 4 to 5 ([ArcadeData#3707](https://redirect.github.com/mockito/mockito/issues/3707)) * [`ad6ae2f`](mockito/mockito@ad6ae2f) Allow overriding 'Created-By' for reproducible builds ([ArcadeData#3704](https://redirect.github.com/mockito/mockito/issues/3704)) * [`096ee9f`](mockito/mockito@096ee9f) Bump org.assertj:assertj-core from 3.27.3 to 3.27.4 ([ArcadeData#3703](https://redirect.github.com/mockito/mockito/issues/3703)) * [`aa7be27`](mockito/mockito@aa7be27) Bump androidx.test:runner from 1.6.2 to 1.7.0 ([ArcadeData#3697](https://redirect.github.com/mockito/mockito/issues/3697)) * [`c8a698b`](mockito/mockito@c8a698b) Remove unused tests * [`ea45979`](mockito/mockito@ea45979) Bump errorprone from 2.39.0 to 2.41.0 * [`9c8eb23`](mockito/mockito@9c8eb23) Bump org.junit.platform:junit-platform-launcher from 1.13.3 to 1.13.4 ([ArcadeData#3694](https://redirect.github.com/mockito/mockito/issues/3694)) * [`f05e44d`](mockito/mockito@f05e44d) Bump com.diffplug.spotless:spotless-plugin-gradle from 7.1.0 to 7.2.1 ([ArcadeData#3693](https://redirect.github.com/mockito/mockito/issues/3693)) * [`9d32dfe`](mockito/mockito@9d32dfe) Bump junit-jupiter from 5.13.3 to 5.13.4 ([ArcadeData#3691](https://redirect.github.com/mockito/mockito/issues/3691)) * Additional commits viewable in [compare view](mockito/mockito@v5.18.0...v5.19.0) [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Summary
GraphAnalyticalViewuses ASYNCHRONOUS update mode, commit notifications arriving while a rebuild is already in progress were silently discarded, causing the view to miss newly committed dataasyncRebuildNeededflag so that a follow-up rebuild is automatically triggered after the current one completesawaitReady()to loop until no pending rebuilds remain, ensuring callers see the fully settled stateTest plan
GraphAnalyticalViewTest#asynchronousUpdateModeMultipleCommits— previously failing, now passesGraphAnalyticalViewTestsuite (121 tests) passes🤖 Generated with Claude Code