-
Notifications
You must be signed in to change notification settings - Fork 9.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
server: removed 'experimental' from warning-unary-request-duration flag #14414
Conversation
Codecov Report
@@ Coverage Diff @@
## main #14414 +/- ##
==========================================
- Coverage 75.66% 75.47% -0.19%
==========================================
Files 457 457
Lines 37320 37324 +4
==========================================
- Hits 28237 28172 -65
- Misses 7320 7369 +49
- Partials 1763 1783 +20
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lavacat I don't see any issues with graduating this feature from experimental but wondering if there was any discussion around the criteria/tests for moving it from experimental? Also, please sign-off your commit message to pass the DCO failure. Thanks!
90d4d9d
to
64a9be8
Compare
The commit 2a26f7a , in which the flag was added, has never been cherry picked to But for this flag, it doesn't change the existing functionality, instead it just makes the value (previously hard code as 300ms) configurable, and defaults to the same previous default value (300ms). So I think the "experimental" should be removed in the first place. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
Thanks @lavacat
Based on the discussion in #14428, removing the |
@lavacat could you please resolve comment above so that we can merge this PR? |
any update on this? @lavacat |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please resolve the review comment.
64a9be8
to
ffa171a
Compare
7f40dd2
to
947fefc
Compare
@@ -217,7 +217,7 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) { | |||
WatchProgressNotifyInterval: cfg.ExperimentalWatchProgressNotifyInterval, | |||
DowngradeCheckTime: cfg.ExperimentalDowngradeCheckTime, | |||
WarningApplyDuration: cfg.ExperimentalWarningApplyDuration, | |||
WarningUnaryRequestDuration: cfg.ExperimentalWarningUnaryRequestDuration, | |||
WarningUnaryRequestDuration: cfg.WarningUnaryRequestDuration, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If users only set ExperimentalWarningUnaryRequestDuration
, we should continue to respect it, but print a warning log. cc @spzala @serathius
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good, I'll add warning log about flag being depreciated. FYI, '--experimental ...' version of the flag is broken at the moment. I'm going to push another update
3e05dee
to
abee748
Compare
@ahrtr ready for review. Used your suggestions, added warning and duplicate test for experimental flag |
It still has a flaw: if both flags are specified by users, then the experimental one is used. This isn't correct. The rough logic should be something like below,
|
Please also add a changelog item. |
46c0c93
to
1b947b6
Compare
server/embed/etcd.go
Outdated
warningUnaryRequestDuration, err := cfg.parseWarningUnaryRequestDuration() | ||
if err != nil { | ||
return e, err | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment #14414 (comment) is still valid.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ahrtr I was following this grouping of parsing functions https://github.com/etcd-io/etcd/blob/main/server/embed/etcd.go#L158
parseCompactionRetention
and parseBackendFreelistType
.
But since this change is about flags (not values), I've moved into config.parse per your suggestion.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Points from my side:
- The new method
parseWarningUnaryRequestDuration
looks good to me; - I don't think it's good to add too much configuration parsing code inside function
StartEtcd
, and the example you followed might need to be moved into(cfg *config)
parse as well. But it's unrelated to this PR, so feel free to resolve it in a separate PR.
2b0e114
to
c4f6dd1
Compare
CHANGELOG/CHANGELOG-3.6.md
Outdated
@@ -19,6 +19,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.5.0...v3.6.0). | |||
|
|||
- Deprecated [V2 discovery](https://etcd.io/docs/v3.5/dev-internal/discovery_protocol/). | |||
- Deprecated [SetKeepAlive and SetKeepAlivePeriod in limitListenerConn](https://github.com/etcd-io/etcd/pull/14356). | |||
- Removed [`experimental` from `--experimental-warning-unary-request-duration`](https://github.com/etcd-io/etcd/pull/14414) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Removed [`experimental` from `--experimental-warning-unary-request-duration`](https://github.com/etcd-io/etcd/pull/14414) | |
- Promoted [`--experimental-warning-unary-request-duration` to `--warning-unary-request-duration`](https://github.com/etcd-io/etcd/pull/14414). Note the experimental flag has already been deprecated and will be decommissioned in v3.7. |
c4f6dd1
to
024e839
Compare
@@ -19,7 +19,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.5.0...v3.6.0). | |||
|
|||
- Deprecated [V2 discovery](https://etcd.io/docs/v3.5/dev-internal/discovery_protocol/). | |||
- Deprecated [SetKeepAlive and SetKeepAlivePeriod in limitListenerConn](https://github.com/etcd-io/etcd/pull/14356). | |||
- Removed [etcdctl defrag --data-dir](https://github.com/etcd-io/etcd/pull/13793). | |||
- Promoted [`--experimental-warning-unary-request-duration` to `--warning-unary-request-duration`](https://github.com/etcd-io/etcd/pull/14414). Note the experimental has already been deprecated and will be decommissioned in v3.7.- Removed [etcdctl defrag --data-dir](https://github.com/etcd-io/etcd/pull/13793). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Promoted [`--experimental-warning-unary-request-duration` to `--warning-unary-request-duration`](https://github.com/etcd-io/etcd/pull/14414). Note the experimental has already been deprecated and will be decommissioned in v3.7.- Removed [etcdctl defrag --data-dir](https://github.com/etcd-io/etcd/pull/13793). | |
- Promoted [`--experimental-warning-unary-request-duration` to `--warning-unary-request-duration`](https://github.com/etcd-io/etcd/pull/14414). Note the experimental flag has already been deprecated and will be decommissioned in v3.7. | |
- Removed [etcdctl defrag --data-dir](https://github.com/etcd-io/etcd/pull/13793). |
Please rebase this PR as well to resolve the conflict. |
024e839
to
5c5525e
Compare
Failing e2e test is TestCtlV3Lock. Possibly related to #14763
|
--warning-unary-request-duration is a duplicate of --experimental-warning-unary-request-duration experimental-warning-unary-request-duration will be removed in v3.7. fixes etcd-io#13783 Signed-off-by: Bogdan Kanivets <bkanivets@apple.com>
5c5525e
to
663581b
Compare
fixes #13783
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.