Skip to content

Commit

Permalink
Backport: Fix remove peers check (#10758) (#10782)
Browse files Browse the repository at this point in the history
* Add list peers to DR secondaries (#10746)

* Fix build (#10749)

* Move the declaration to a OSS build tag file to not have it collide w… (#10750)

* Move the declaration to a OSS build tag file to not have it collide with ent declarations

* Add comment

* Remove comment to trigger ci

* Fix remove peers check (#10758)
  • Loading branch information
vishalnayak committed Jan 26, 2021
1 parent 4d4a2f1 commit 09f9068
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions vault/logical_system_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ var (
}

checkRaw = func(b *SystemBackend, path string) error { return nil }

wrapHandleRaftRemovePeer = func(b *SystemBackend) framework.OperationFunc {
return b.handleRaftRemovePeerUpdate()
}
)

// tuneMount is used to set config on a mount point
Expand Down
2 changes: 1 addition & 1 deletion vault/logical_system_raft.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (b *SystemBackend) raftStoragePaths() []*framework.Path {

Operations: map[logical.Operation]framework.OperationHandler{
logical.UpdateOperation: &framework.PathOperation{
Callback: wrapHandleRaftRemovePeer(b),
Callback: b.verifyDROperationToken(b.handleRaftRemovePeerUpdate(), false),
Summary: "Remove a peer from the raft cluster.",
},
},
Expand Down

0 comments on commit 09f9068

Please sign in to comment.