Skip to content

Commit

Permalink
Always forward entity merge requests from perfStandby (#24325)
Browse files Browse the repository at this point in the history
Update requests to /sys/identity/entity/merge perform merges on perfStandby nodes in memory and skip the persist call.

This commit changes the behavior for the merge endpoint, forcing it to be forwarded from the standby to the active node. This change is specifically scoped to manual merges, as automatic merges are not isolated to a specific endpoint and require careful consideration for all callers.
  • Loading branch information
mpalmi authored Dec 1, 2023
1 parent 06b9325 commit 4a7bee5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions changelog/24325.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
```release-note:change
identity (enterprise): POST requests to the `/identity/entity/merge` endpoint
are now always forwarded from standbys to the active node.
```
3 changes: 2 additions & 1 deletion vault/identity_store_entities.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,8 @@ func entityPaths(i *IdentityStore) []*framework.Path {
},
Operations: map[logical.Operation]framework.OperationHandler{
logical.UpdateOperation: &framework.PathOperation{
Callback: i.pathEntityMergeID(),
Callback: i.pathEntityMergeID(),
ForwardPerformanceStandby: true,
},
},

Expand Down

0 comments on commit 4a7bee5

Please sign in to comment.