Skip to content

Handle deviations (revertive) solely within DS#379

Merged
steiler merged 19 commits intomainfrom
deviations
Feb 12, 2026
Merged

Handle deviations (revertive) solely within DS#379
steiler merged 19 commits intomainfrom
deviations

Conversation

@steiler
Copy link
Collaborator

@steiler steiler commented Jan 19, 2026

  • Make the syncing of running not blindly overwrite but transfor the sync tree

@steiler steiler marked this pull request as draft January 19, 2026 12:39
@henderiw henderiw moved this to Backlog in SDC project Jan 19, 2026
@henderiw henderiw added this to the MS26-05 milestone Jan 19, 2026
@henderiw henderiw moved this from Backlog to In progress in SDC project Jan 26, 2026
@henderiw henderiw moved this from In progress to Backlog in SDC project Jan 26, 2026
@henderiw henderiw moved this from Backlog to In progress in SDC project Jan 26, 2026
@henderiw henderiw removed this from the MS26-05 milestone Jan 26, 2026
@steiler
Copy link
Collaborator Author

steiler commented Jan 28, 2026

We need to fix another conceptual flaw that exists atm with the non-revertive intents.
So now, if DS sees an intent (also non-revertive) for the first time, I will take it and apply it. Because this is a new intent basically, hence we need to apply. So far so good...
But when DS restarts and CS sends the intent again, I see the intent for the first time hence I assume that it is meant to be applied. So a restart of DS causes the first time intent apply to become revertive.

So we might need to add another flag for CS to set, which indicates if the intent is new or not.
What's the expected behaviour for the case where a config intent is altered?

@steiler
Copy link
Collaborator Author

steiler commented Jan 28, 2026

Fixes #383
by considering only leaf entries as second highest if they are not marked for deletion.
https://github.com/sdcio/data-server/pull/379/changes#diff-3cda332246a4bf91747920508400cb96c741f5126758e42403547b035032a148R332

@steiler steiler linked an issue Jan 28, 2026 that may be closed by this pull request
@henderiw
Copy link
Contributor

#379 (comment)

Can we put these comments in the epic issue since they cover multiple entities
sdcio/.github#12

The way to solve this in my view is have recovery include the deviations.

@steiler steiler linked an issue Jan 28, 2026 that may be closed by this pull request
@steiler steiler linked an issue Jan 28, 2026 that may be closed by this pull request
@steiler steiler marked this pull request as ready for review February 3, 2026 12:47
Copy link
Contributor

@henderiw henderiw left a comment

Choose a reason for hiding this comment

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

lgtm

@henderiw henderiw moved this from In progress to In review in SDC project Feb 9, 2026
@steiler steiler force-pushed the deviations branch 2 times, most recently from bc6b1c7 to 80748a3 Compare February 11, 2026 12:00
Copy link
Contributor

@alexandernorth alexandernorth left a comment

Choose a reason for hiding this comment

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

lgtm

@steiler
Copy link
Collaborator Author

steiler commented Feb 12, 2026

Ran tests manually against actual main of config-server.
Only the non-revertive tests are failing which is expected at this point in time, since that functionality is not yet implemented in DS. This will be covered in a seperate PR.
https://github.com/sdcio/integration-tests/actions/runs/21937698324

Going to merge this now.

@steiler steiler merged commit d799bf5 into main Feb 12, 2026
5 of 6 checks passed
@github-project-automation github-project-automation bot moved this from In review to Done in SDC project Feb 12, 2026
@codecov
Copy link

codecov bot commented Feb 12, 2026

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Move revertive/non-revertive processing into data-server Calculate new highest LeafVariant after delete

3 participants