Skip to content
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

[3.5] Backport expose socket options #16435

Merged
merged 2 commits into from
Aug 18, 2023

Conversation

jmhbnz
Copy link
Member

@jmhbnz jmhbnz commented Aug 18, 2023

Currently in main it's possible to specify --socket-reuse-port and --socket-reuse-address in the config file. However, the same cannot be done for release-3.5.

An added complication is that the format for specifying these in the config file differs slightly from the command line parameter. Example below:

socket-options:
  reuse-port: true

This backport addresses the immediate bug of configuration via file for these options not being possible in release-3.5.

In future, we should also consider aligning the way the option name should be used in both the configuration file and the command flags.

Relates to #16399.

so that they cabn be configured via config file.

Co-authored-by: Shawn Gerrard <shawn.gerrard@gmail.com>
Signed-off-by: James Blair <mail@jamesblair.net>
@jmhbnz
Copy link
Member Author

jmhbnz commented Aug 18, 2023

As another follow-up we should update our sample etcd config file to make it clear how these options should be specified.

@jmhbnz jmhbnz force-pushed the backport-expose-socket-options branch 2 times, most recently from 18ba7aa to 66faec3 Compare August 18, 2023 02:48
Copy link
Contributor

@fuweid fuweid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jmhbnz jmhbnz force-pushed the backport-expose-socket-options branch from 66faec3 to f23416e Compare August 18, 2023 03:37
Co-authored-by: Shawn Gerrard <shawn.gerrard@gmail.com>
Signed-off-by: James Blair <mail@jamesblair.net>
@jmhbnz jmhbnz force-pushed the backport-expose-socket-options branch from f23416e to 164175d Compare August 18, 2023 07:15
@ahrtr ahrtr merged commit 0b598c4 into etcd-io:release-3.5 Aug 18, 2023
12 checks passed
@ahrtr
Copy link
Member

ahrtr commented Aug 18, 2023

Could you also add a changelog item for 3.5? @jmhbnz

@ahrtr
Copy link
Member

ahrtr commented Oct 27, 2023

Note: the option SocketOpts was introduced in 3.5 in #12702, so no need to backport this PR to 3.4.

@jmhbnz
Copy link
Member Author

jmhbnz commented Oct 27, 2023

Note: the option SocketOpts was introduced in 3.5 in #12702, so no need to backport this PR to 3.4.

Hmm if the feature is not in release-3.4 why would we backport a fix for the feature to that branch? That would mean we need to backport the whole feature?

@chaochn47
Copy link
Member

I guess "no need" here means "there is no need" :)

New 3.4 release won't consider backporting this PR.

@ahrtr
Copy link
Member

ahrtr commented Oct 27, 2023

I do not get why my previous comment caused confusion:)

@jmhbnz
Copy link
Member Author

jmhbnz commented Oct 27, 2023

I guess "no need" here means "there is no need" :)

Whoops completely misread lol, thanks @chaochn47 🤦🏻‍♂️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants