luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

server: fix spurious blocking query suppression for discovery chains (#12512) 

Minor fix for behavior in #12362

IsDefault sometimes returns true even if there was a proxy-defaults or service-defaults config entry that was consulted. This PR fixes that.
This commit is contained in:
R.B. Boyer 2022-03-03 16:54:41 -06:00 committed by GitHub
parent d14ddb7a23
commit 07b92a2855
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/12512.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
server: fix spurious blocking query suppression for discovery chains
```

4
agent/consul/discovery_chain_endpoint.go
View File

@ -66,7 +66,7 @@ func (c *DiscoveryChain) Get(args *structs.DiscoveryChainRequest, reply *structs
OverrideProtocol: args.OverrideProtocol, OverrideProtocol: args.OverrideProtocol,
OverrideConnectTimeout: args.OverrideConnectTimeout, OverrideConnectTimeout: args.OverrideConnectTimeout,
} }
index, chain, err := state.ServiceDiscoveryChain(ws, args.Name, entMeta, req) index, chain, entries, err := state.ServiceDiscoveryChain(ws, args.Name, entMeta, req)
if err != nil { if err != nil {
return err return err
} }
@ -93,7 +93,7 @@ func (c *DiscoveryChain) Get(args *structs.DiscoveryChainRequest, reply *structs
reply.Index = index reply.Index = index
reply.Chain = chain reply.Chain = chain
if chain.IsDefault() { if entries.IsEmpty() {
return errNotFound return errNotFound
} }

20
agent/consul/state/config_entry.go
View File

@ -431,7 +431,7 @@ func (s *Store) discoveryChainTargetsTxn(tx ReadTxn, ws memdb.WatchSet, dc, serv
EvaluateInPartition: source.PartitionOrDefault(), EvaluateInPartition: source.PartitionOrDefault(),
EvaluateInDatacenter: dc, EvaluateInDatacenter: dc,
} }
idx, chain, err := s.serviceDiscoveryChainTxn(tx, ws, source.Name, entMeta, req) idx, chain, _, err := s.serviceDiscoveryChainTxn(tx, ws, source.Name, entMeta, req)
if err != nil { if err != nil {
return 0, nil, fmt.Errorf("failed to fetch discovery chain for %q: %v", source.String(), err) return 0, nil, fmt.Errorf("failed to fetch discovery chain for %q: %v", source.String(), err)
} }
@ -488,7 +488,7 @@ func (s *Store) discoveryChainSourcesTxn(tx ReadTxn, ws memdb.WatchSet, dc strin
EvaluateInPartition: sn.PartitionOrDefault(), EvaluateInPartition: sn.PartitionOrDefault(),
EvaluateInDatacenter: dc, EvaluateInDatacenter: dc,
} }
idx, chain, err := s.serviceDiscoveryChainTxn(tx, ws, sn.Name, &sn.EnterpriseMeta, req) idx, chain, _, err := s.serviceDiscoveryChainTxn(tx, ws, sn.Name, &sn.EnterpriseMeta, req)
if err != nil { if err != nil {
return 0, nil, fmt.Errorf("failed to fetch discovery chain for %q: %v", sn.String(), err) return 0, nil, fmt.Errorf("failed to fetch discovery chain for %q: %v", sn.String(), err)
} }
@ -772,7 +772,7 @@ func (s *Store) ServiceDiscoveryChain(
serviceName string, serviceName string,
entMeta *structs.EnterpriseMeta, entMeta *structs.EnterpriseMeta,
req discoverychain.CompileRequest, req discoverychain.CompileRequest,
) (uint64, *structs.CompiledDiscoveryChain, error) { ) (uint64, *structs.CompiledDiscoveryChain, *configentry.DiscoveryChainSet, error) {
tx := s.db.ReadTxn() tx := s.db.ReadTxn()
defer tx.Abort() defer tx.Abort()
@ -785,19 +785,19 @@ func (s *Store) serviceDiscoveryChainTxn(
serviceName string, serviceName string,
entMeta *structs.EnterpriseMeta, entMeta *structs.EnterpriseMeta,
req discoverychain.CompileRequest, req discoverychain.CompileRequest,
) (uint64, *structs.CompiledDiscoveryChain, error) { ) (uint64, *structs.CompiledDiscoveryChain, *configentry.DiscoveryChainSet, error) {
index, entries, err := readDiscoveryChainConfigEntriesTxn(tx, ws, serviceName, nil, entMeta) index, entries, err := readDiscoveryChainConfigEntriesTxn(tx, ws, serviceName, nil, entMeta)
if err != nil { if err != nil {
return 0, nil, err return 0, nil, nil, err
} }
req.Entries = entries req.Entries = entries
_, config, err := s.CAConfig(ws) _, config, err := s.CAConfig(ws)
if err != nil { if err != nil {
return 0, nil, err return 0, nil, nil, err
} else if config == nil { } else if config == nil {
return 0, nil, errors.New("no cluster ca config setup") return 0, nil, nil, errors.New("no cluster ca config setup")
} }
// Build TrustDomain based on the ClusterID stored. // Build TrustDomain based on the ClusterID stored.
@ -805,17 +805,17 @@ func (s *Store) serviceDiscoveryChainTxn(
if signingID == nil { if signingID == nil {
// If CA is bootstrapped at all then this should never happen but be // If CA is bootstrapped at all then this should never happen but be
// defensive. // defensive.
return 0, nil, errors.New("no cluster trust domain setup") return 0, nil, nil, errors.New("no cluster trust domain setup")
} }
req.EvaluateInTrustDomain = signingID.Host() req.EvaluateInTrustDomain = signingID.Host()
// Then we compile it into something useful. // Then we compile it into something useful.
chain, err := discoverychain.Compile(req) chain, err := discoverychain.Compile(req)
if err != nil { if err != nil {
return 0, nil, fmt.Errorf("failed to compile discovery chain: %v", err) return 0, nil, nil, fmt.Errorf("failed to compile discovery chain: %v", err)
} }
return index, chain, nil return index, chain, entries, nil
} }
func (s *Store) ReadResolvedServiceConfigEntries( func (s *Store) ReadResolvedServiceConfigEntries(