Seal HA Improvements, CE side (#25171)

* add fully_wrapped to seal-backend-status, try to find in-common seals in all cases

* changelog
This commit is contained in:
Scott Miller
2024-02-01 14:09:40 -06:00
committed by GitHub
parent aab72100fb
commit 1473dace75
3 changed files with 32 additions and 16 deletions

3
changelog/25171.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:improvement
core (enterprise): Improve seal unwrap performance when in degraded mode with one or more unhealthy seals.
```

View File

@@ -5420,6 +5420,7 @@ type SealBackendStatusResponse struct {
Healthy bool `json:"healthy"` Healthy bool `json:"healthy"`
UnhealthySince string `json:"unhealthy_since,omitempty"` UnhealthySince string `json:"unhealthy_since,omitempty"`
Backends []SealBackendStatus `json:"backends"` Backends []SealBackendStatus `json:"backends"`
FullyWrapped bool `json:"fully_wrapped"`
} }
func (core *Core) GetSealStatus(ctx context.Context, lock bool) (*SealStatusResponse, error) { func (core *Core) GetSealStatus(ctx context.Context, lock bool) (*SealStatusResponse, error) {
@@ -5545,6 +5546,13 @@ func (c *Core) GetSealBackendStatus(ctx context.Context) (*SealBackendStatusResp
} }
r.Healthy = true r.Healthy = true
} }
pps, err := GetPartiallySealWrappedPaths(ctx, c.physical)
if err != nil {
return nil, fmt.Errorf("could not list partially seal wrapped values: %w", err)
}
genInfo := c.seal.GetAccess().GetSealGenerationInfo()
r.FullyWrapped = genInfo.IsRewrapped() && len(pps) == 0
return &r, nil return &r, nil
} }

View File

@@ -724,26 +724,31 @@ func (a *access) Decrypt(ctx context.Context, ciphertext *MultiWrapValue, option
} }
// Start goroutines to decrypt the value // Start goroutines to decrypt the value
first := wrappersByPriority[0] first := wrappersByPriority[0]
// First, if we only have one slot, try matching by keyId found := false
if len(blobInfoMap) == 1 { outer:
outer: // This loop finds the highest priority seal with a keyId in common with the blobInfoMap,
for k := range blobInfoMap { // and ensures we'll use it first. This should equal the highest priority wrapper in the nominal
for _, sealWrapper := range wrappersByPriority { // case, but may not if a seal is unhealthy. This ensures we try the highest priority healthy
keyId, err := sealWrapper.Wrapper.KeyId(ctx) // seal first if available, and warn if we don't think we have one in common.
if err != nil { for k := range blobInfoMap {
resultWg.Add(1) for _, sealWrapper := range wrappersByPriority {
go reportResult(sealWrapper.Name, nil, false, err) keyId, err := sealWrapper.Wrapper.KeyId(ctx)
continue if err != nil {
} resultWg.Add(1)
if keyId == k { go reportResult(sealWrapper.Name, nil, false, err)
first = sealWrapper continue
break outer }
} if keyId == k {
found = true
first = sealWrapper
break outer
} }
} }
} }
if !found {
a.logger.Warn("while unwrapping, value has no key-id in common with currently healthy seals. Trying all healthy seals")
}
resultWg.Add(1) resultWg.Add(1)
go decrypt(first) go decrypt(first)