3804677570
Starting from and extending the mechanism introduced in #12110 we can specially handle the 3 main special Consul RPC endpoints that react to many config entries in a single blocking query in Connect: - `DiscoveryChain.Get` - `ConfigEntry.ResolveServiceConfig` - `Intentions.Match` All of these will internally watch for many config entries, and at least one of those will likely be not found in any given query. Because these are blends of multiple reads the exact solution from #12110 isn't perfectly aligned, but we can tweak the approach slightly and regain the utility of that mechanism. ### No Config Entries Found In this case, despite looking for many config entries none may be found at all. Unlike #12110 in this scenario we do not return an empty reply to the caller, but instead synthesize a struct from default values to return. This can be handled nearly identically to #12110 with the first 1-2 replies being non-empty payloads followed by the standard spurious wakeup suppression mechanism from #12110. ### No Change Since Last Wakeup Once a blocking query loop on the server has completed and slept at least once, there is a further optimization we can make here to detect if any of the config entries that were present at specific versions for the prior execution of the loop are identical for the loop we just woke up for. In that scenario we can return a slightly different internal sentinel error and basically externally handle it similar to #12110. This would mean that even if 20 discovery chain read RPC handling goroutines wakeup due to the creation of an unrelated config entry, the only ones that will terminate and reply with a blob of data are those that genuinely have new data to report. ### Extra Endpoints Since this pattern is pretty reusable, other key config-entry-adjacent endpoints used by `agent/proxycfg` also were updated: - `ConfigEntry.List` - `Internal.IntentionUpstreams` (tproxy)
39 lines
954 B
Go
39 lines
954 B
Go
package configentry
|
|
|
|
import (
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
)
|
|
|
|
// KindName is a value type useful for maps. You can use:
|
|
// map[KindName]Payload
|
|
// instead of:
|
|
// map[string]map[string]Payload
|
|
type KindName struct {
|
|
Kind string
|
|
Name string
|
|
structs.EnterpriseMeta
|
|
}
|
|
|
|
// NewKindName returns a new KindName. The EnterpriseMeta values will be
|
|
// normalized based on the kind.
|
|
//
|
|
// Any caller which modifies the EnterpriseMeta field must call Normalize
|
|
// before persisting or using the value as a map key.
|
|
func NewKindName(kind, name string, entMeta *structs.EnterpriseMeta) KindName {
|
|
ret := KindName{
|
|
Kind: kind,
|
|
Name: name,
|
|
}
|
|
if entMeta == nil {
|
|
entMeta = structs.DefaultEnterpriseMetaInDefaultPartition()
|
|
}
|
|
|
|
ret.EnterpriseMeta = *entMeta
|
|
ret.Normalize()
|
|
return ret
|
|
}
|
|
|
|
func NewKindNameForEntry(entry structs.ConfigEntry) KindName {
|
|
return NewKindName(entry.GetKind(), entry.GetName(), entry.GetEnterpriseMeta())
|
|
}
|