Skip to content

Commit

Permalink
metadata: memoize the parsed build versions (#22113)
Browse files Browse the repository at this point in the history
There will only be a small set of consul build versions that a single consul
server will witness. Inside of metadata.IsConsulServer we use a very
expensive function in the hashicorp/go-version library to parse these into
read-only *version.Version structs all over Consul.

Memoize these in a package cache map. Likely the thing will only have like
2 keys in it ever over the life of the process.
  • Loading branch information
rboyer authored Feb 3, 2025
1 parent 3e0c098 commit 00d74ab
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .changelog/22113.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
metadata: memoize the parsed build versions
```
38 changes: 37 additions & 1 deletion agent/metadata/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,48 @@
package metadata

import (
"sync"

"github.com/hashicorp/go-version"
"github.com/hashicorp/serf/serf"
)

type versionTuple struct {
Value *version.Version
Err error
}

var versionCache sync.Map // string->versionTuple

// Build extracts the Consul version info for a member.
func Build(m *serf.Member) (*version.Version, error) {
str := versionFormat.FindString(m.Tags["build"])
build := m.Tags["build"]

ok, v, err := getMemoizedBuildVersion(build)
if ok {
return v, err
}

v, err = parseBuildAsVersion(build)

versionCache.Store(build, versionTuple{Value: v, Err: err})

return v, err
}

func getMemoizedBuildVersion(build string) (bool, *version.Version, error) {
rawTuple, ok := versionCache.Load(build)
if !ok {
return false, nil, nil
}
tuple, ok := rawTuple.(versionTuple)
if !ok {
return false, nil, nil
}
return true, tuple.Value, tuple.Err
}

func parseBuildAsVersion(build string) (*version.Version, error) {
str := versionFormat.FindString(build)
return version.NewVersion(str)
}
10 changes: 5 additions & 5 deletions agent/metadata/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,6 @@ func IsConsulServer(m serf.Member) (bool, *Server) {
}
}

buildVersion, err := Build(&m)
if err != nil {
return false, nil
}

wanJoinPort := 0
wanJoinPortStr, ok := m.Tags["wan_join_port"]
if ok {
Expand Down Expand Up @@ -180,6 +175,11 @@ func IsConsulServer(m serf.Member) (bool, *Server) {

addr := &net.TCPAddr{IP: m.Addr, Port: port}

buildVersion, err := Build(&m)
if err != nil {
return false, nil
}

parts := &Server{
Name: m.Name,
ShortName: strings.TrimSuffix(m.Name, "."+datacenter),
Expand Down

0 comments on commit 00d74ab

Please sign in to comment.