mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Merge pull request #17387 from Elbehery/backport_35_SetKeepAlivePeriod_OpenBSD
[3.5] Backport ignore SetKeepAlivePeriod errors on OpenBSD
This commit is contained in:
commit
c2b458c56b
@ -87,11 +87,6 @@ func (l *keepAliveConn) SetKeepAlive(doKeepAlive bool) error {
|
|||||||
return l.TCPConn.SetKeepAlive(doKeepAlive)
|
return l.TCPConn.SetKeepAlive(doKeepAlive)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetKeepAlivePeriod sets keepalive period
|
|
||||||
func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error {
|
|
||||||
return l.TCPConn.SetKeepAlivePeriod(d)
|
|
||||||
}
|
|
||||||
|
|
||||||
// A tlsKeepaliveListener implements a network listener (net.Listener) for TLS connections.
|
// A tlsKeepaliveListener implements a network listener (net.Listener) for TLS connections.
|
||||||
type tlsKeepaliveListener struct {
|
type tlsKeepaliveListener struct {
|
||||||
net.Listener
|
net.Listener
|
||||||
|
26
client/pkg/transport/keepalive_listener_openbsd.go
Normal file
26
client/pkg/transport/keepalive_listener_openbsd.go
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
// Copyright 2023 The etcd Authors
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
//go:build openbsd
|
||||||
|
|
||||||
|
package transport
|
||||||
|
|
||||||
|
import "time"
|
||||||
|
|
||||||
|
// SetKeepAlivePeriod sets keepalive period
|
||||||
|
func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error {
|
||||||
|
// OpenBSD has no user-settable per-socket TCP keepalive options.
|
||||||
|
// Refer to https://github.com/etcd-io/etcd/issues/15811.
|
||||||
|
return nil
|
||||||
|
}
|
24
client/pkg/transport/keepalive_listener_unix.go
Normal file
24
client/pkg/transport/keepalive_listener_unix.go
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
// Copyright 2023 The etcd Authors
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
//go:build !openbsd
|
||||||
|
|
||||||
|
package transport
|
||||||
|
|
||||||
|
import "time"
|
||||||
|
|
||||||
|
// SetKeepAlivePeriod sets keepalive period
|
||||||
|
func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error {
|
||||||
|
return l.TCPConn.SetKeepAlivePeriod(d)
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user