Skip to content
Snippets Groups Projects

Fix reconciler not working after reapply when was still queued

Merged Administrator requested to merge es/rewirer-fix into main

Created by: eseliger

This fixes an error where the reconciler would determine an empty delta between changeset specs, when the user applies again before a changeset record was processed or had errored.

I hope I am not missing something. @mrnugget asking you for special care when reviewing as you probably have the most insight into the rewirer/reconciler since you originally wrote most of them. I hope this doesn't have other side-effects.

Closes https://github.com/sourcegraph/sourcegraph/issues/16041

Merge request reports

Approval is optional

Merged by avatar (Jul 5, 2025 2:50pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Created by: sourcegraph-bot

    Notifying subscribers in CODENOTIFY files for diff 659d169ab2e23e89e43a09f899f825f04a476a43...a29ea92ff6ff3f2a317df5a7493277279b337728.

    Notify File(s)
    @LawnGnome enterprise/internal/campaigns/rewirer.go
    enterprise/internal/campaigns/service_apply_campaign_test.go
  • Created by: codecov[bot]

    Codecov Report

    Merging #16144 (a29ea92) into main (659d169) will decrease coverage by 0.00%. The diff coverage is 100.00%.

    @@            Coverage Diff             @@
    ##             main   #16144      +/-   ##
    ==========================================
    - Coverage   52.78%   52.78%   -0.01%     
    ==========================================
      Files        1646     1646              
      Lines       82355    82358       +3     
      Branches     7407     7407              
    ==========================================
    + Hits        43470    43471       +1     
    - Misses      35033    35034       +1     
    - Partials     3852     3853       +1     
    Flag Coverage Δ *Carryforward flag
    go 52.53% <100.00%> (-0.01%) :arrow_down:
    integration 28.45% <ø> (ø) Carriedforward from 616e86e
    storybook 28.03% <ø> (ø) Carriedforward from 616e86e
    typescript 53.39% <ø> (ø) Carriedforward from 616e86e
    unit 35.90% <ø> (ø) Carriedforward from 616e86e

    *This pull request uses carry forward flags. Click here to find out more.

    Impacted Files Coverage Δ
    enterprise/internal/campaigns/rewirer.go 82.90% <100.00%> (+0.44%) :arrow_up:
    .../internal/codeintel/resolvers/graphql/locations.go 83.50% <0.00%> (-2.07%) :arrow_down:
Please register or sign in to reply
Loading