base, licenseccl: Revise resolution strategy for LicenseTTL #129052
Conversation
|
This change is |
| log.Errorf(ctx, "unable to initialize periodic license metric update: %v", err) | ||
| } | ||
| appRegistry.AddMetric(metric.NewFunctionalGauge(base.LicenseTTLMetadata, func() int64 { | ||
| return base.GetLicenseTTL(ctx, cfg.Settings, timeutil.DefaultTimeSource{}) |
There was a problem hiding this comment.
the cluster settings are closed here on server startup
There was a problem hiding this comment.
Reviewed all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @xinhaoz)
angles-n-daemons
force-pushed
the
license-tickdown-metric-revision
branch
3 times, most recently
from
e118486
to
8849773
Compare
pkg/base/license.go
Outdated
| var LicenseTTL = metric.NewGauge(licenseTTLMetadata) | ||
| var AdditionalLicenseTTLMetadata = metric.Metadata{ | ||
| Name: "seconds_until_license_expiry", | ||
| Help: "Seconds until license expiry (0 if no license present or running without enterprise features)", |
There was a problem hiding this comment.
Is it intentional that this help string is still referencing enterprise?
There was a problem hiding this comment.
Hmm this is a good question, I'll check in to see what we want the help string to look like
There was a problem hiding this comment.
good check, changed the helptext copy
Previously, for resolving the cluster's license expiry we relied on a metric whose value was regularly ticked down by an async task. This change seeks to only the resolve value at read time by reading directly from the cluster settings when its requested. Release note: None Fixes: CRDB-40592 Epic: CRDB-8035
angles-n-daemons
force-pushed
the
license-tickdown-metric-revision
branch
from
8849773
to
d9c375b
Compare
|
bors r+ |
|
blathers backport 24.2 24.1 23.2 23.1 |
![blathers[crl]](https://avatars.githubusercontent.com/in/59700?s=40&u=373d9101a12edc3847d2fb6ae78e3adcfb4ca41e&v=4){kind=avatar}
|
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error setting reviewers, but backport branch blathers/backport-release-24.2-129052 is ready: POST https://api.github.com/repos/cockroachdb/cockroach/pulls/129871/requested_reviewers: 422 Reviews may only be requested from collaborators. One or more of the teams you specified is not a collaborator of the cockroachdb/cockroach repository. [] Backport to branch 24.2 failed. See errors above. error setting reviewers, but backport branch blathers/backport-release-24.1-129052 is ready: POST https://api.github.com/repos/cockroachdb/cockroach/pulls/129873/requested_reviewers: 422 Reviews may only be requested from collaborators. One or more of the teams you specified is not a collaborator of the cockroachdb/cockroach repository. [] Backport to branch 24.1 failed. See errors above. error creating merge commit from d9c375b to blathers/backport-release-23.2-129052: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict [] you may need to manually resolve merge conflicts with the backport tool. Backport to branch 23.2 failed. See errors above. error creating merge commit from d9c375b to blathers/backport-release-23.1-129052: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict [] you may need to manually resolve merge conflicts with the backport tool. Backport to branch 23.1 failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
Previously, for resolving the cluster's license expiry we relied on a metric
whose value was regularly ticked down by an async task. This change seeks to
only the resolve value at read time by reading directly from the cluster
settings when its requested.
Release note: None
Fixes: CRDB-40592
Epic: CRDB-8035