Repository navigation
Keep existing profiles when subscription import fails - #10429
Open
dajiaohuang wants to merge 1 commit into
Open
dajiaohuang wants to merge 1 commit into
dajiaohuang wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related to #10370. This addresses the profile-loss portion of that report; it does not diagnose or fix the underlying parser exception.
AddBatchServerspreviously removed existing subscription profiles before attempting to parse the replacement. When the import failed or threw before accepting any new profiles, that ordering had already deleted the old rows. Defer removal until at least one new profile is imported, then remove only the snapshotted subscription-owned rows.Regression coverage verifies that a failed import preserves the prior profile and a successful full-config import still replaces the prior subscription entry.
Validation:
dotnet test --project ./v2rayN/ServiceLib.Tests -c Release --results-directory ./TestResults -- --report-trx— 137 passed.git diff --check— clean.