Add a paramter in state store methods to indicate whether a resource insertion is from a snapshot restoration #9156
Conversation
This file contains 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
…g a snapshot restore in a bunch of places The Catalog, Config Entry, KV and Session resources potentially re-validate the input as its coming in. We need to prevent snapshot restoration failures due to missing namespaces or namespaces that are being deleted in enterprise.
mkeeler
force-pushed
the
oss-sync/2020.11.11
branch
from
b7d0c92
to
06601a0
Compare
|
Would you want to use the same mechanism to help with item replication in a secondary DC as we had discussed separately recently? |
|
@rboyer We probably want something very similar for that. It probably will slightly alter what this code touches but needs to have some extra data baked into the request types so that we can know when applying to the FSM whether it was a normal write or a replication write. |
|
🍒 Starting backport cherry picking. To cherry-pick post-merge, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/278129. |
|
🍒✅ Cherry pick of commit 71da020 onto |
hashicorp-ci
pushed a commit
that referenced
this pull request
Nov 11, 2020
…insertion is from a snapshot restoration (#9156) The Catalog, Config Entry, KV and Session resources potentially re-validate the input as its coming in. We need to prevent snapshot restoration failures due to missing namespaces or namespaces that are being deleted in enterprise.
mkeeler
added a commit
that referenced
this pull request
Nov 11, 2020
…insertion is from a snapshot restoration (#9156) The Catalog, Config Entry, KV and Session resources potentially re-validate the input as its coming in. We need to prevent snapshot restoration failures due to missing namespaces or namespaces that are being deleted in enterprise. # Conflicts: # agent/consul/state/catalog.go # agent/consul/state/catalog_events_test.go # agent/consul/state/catalog_oss.go # agent/consul/state/kvs.go # agent/consul/state/kvs_oss.go # agent/consul/state/session.go # agent/consul/state/session_oss.go
mkeeler
added a commit
that referenced
this pull request
Nov 11, 2020
…insertion is from a snapshot restoration (#9156) The Catalog, Config Entry, KV and Session resources potentially re-validate the input as its coming in. We need to prevent snapshot restoration failures due to missing namespaces or namespaces that are being deleted in enterprise. # Conflicts: # agent/consul/state/catalog.go # agent/consul/state/catalog_events_test.go # agent/consul/state/catalog_oss.go # agent/consul/state/kvs.go # agent/consul/state/kvs_oss.go # agent/consul/state/session.go # agent/consul/state/session_oss.go
mkeeler
added a commit
that referenced
this pull request
Nov 11, 2020
mkeeler
added a commit
that referenced
this pull request
Nov 11, 2020
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.
This helps fix an issue in Consul Enterprise, where the rest of the fix is, where snapshots can fail to restore if a namespace deletion was in progress when the snapshot was taken.
The fix is to ignore namespace existence checks when we are restoring data and then let the deferred namespace deletion routines delete the data normally.