mirror of
https://github.com/kubernetes/client-go.git
synced 2025-07-07 20:18:44 +00:00
Merge pull request #63936 from awly/extract-connwatch
Automatic merge from submit-queue (batch tested with PRs 63865, 57849, 63932, 63930, 63936). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Extract connection rotating dialer into a package **What this PR does / why we need it**: This will be re-used for exec auth plugin to rotate connections on credential change. **Special notes for your reviewer**: this was split from https://github.com/kubernetes/kubernetes/pull/61803 to simplify review **Release note**: ```release-note NONE ``` Kubernetes-commit: da8e25c63dbc48f35065f5790f2f522bbe0c3641
This commit is contained in:
commit
4bb327ea2f
105
util/connrotation/connrotation.go
Normal file
105
util/connrotation/connrotation.go
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2018 The Kubernetes 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Package connrotation implements a connection dialer that tracks and can close
|
||||||
|
// all created connections.
|
||||||
|
//
|
||||||
|
// This is used for credential rotation of long-lived connections, when there's
|
||||||
|
// no way to re-authenticate on a live connection.
|
||||||
|
package connrotation
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DialFunc is a shorthand for signature of net.DialContext.
|
||||||
|
type DialFunc func(ctx context.Context, network, address string) (net.Conn, error)
|
||||||
|
|
||||||
|
// Dialer opens connections through Dial and tracks them.
|
||||||
|
type Dialer struct {
|
||||||
|
dial DialFunc
|
||||||
|
|
||||||
|
mu sync.Mutex
|
||||||
|
conns map[*closableConn]struct{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewDialer creates a new Dialer instance.
|
||||||
|
//
|
||||||
|
// If dial is not nil, it will be used to create new underlying connections.
|
||||||
|
// Otherwise net.DialContext is used.
|
||||||
|
func NewDialer(dial DialFunc) *Dialer {
|
||||||
|
return &Dialer{
|
||||||
|
dial: dial,
|
||||||
|
conns: make(map[*closableConn]struct{}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// CloseAll forcibly closes all tracked connections.
|
||||||
|
//
|
||||||
|
// Note: new connections may get created before CloseAll returns.
|
||||||
|
func (d *Dialer) CloseAll() {
|
||||||
|
d.mu.Lock()
|
||||||
|
conns := d.conns
|
||||||
|
d.conns = make(map[*closableConn]struct{})
|
||||||
|
d.mu.Unlock()
|
||||||
|
|
||||||
|
for conn := range conns {
|
||||||
|
conn.Close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Dial creates a new tracked connection.
|
||||||
|
func (d *Dialer) Dial(network, address string) (net.Conn, error) {
|
||||||
|
return d.DialContext(context.Background(), network, address)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DialContext creates a new tracked connection.
|
||||||
|
func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
||||||
|
conn, err := d.dial(ctx, network, address)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
closable := &closableConn{Conn: conn}
|
||||||
|
|
||||||
|
// Start tracking the connection
|
||||||
|
d.mu.Lock()
|
||||||
|
d.conns[closable] = struct{}{}
|
||||||
|
d.mu.Unlock()
|
||||||
|
|
||||||
|
// When the connection is closed, remove it from the map. This will
|
||||||
|
// be no-op if the connection isn't in the map, e.g. if CloseAll()
|
||||||
|
// is called.
|
||||||
|
closable.onClose = func() {
|
||||||
|
d.mu.Lock()
|
||||||
|
delete(d.conns, closable)
|
||||||
|
d.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
return closable, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type closableConn struct {
|
||||||
|
onClose func()
|
||||||
|
net.Conn
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *closableConn) Close() error {
|
||||||
|
go c.onClose()
|
||||||
|
return c.Conn.Close()
|
||||||
|
}
|
61
util/connrotation/connrotation_test.go
Normal file
61
util/connrotation/connrotation_test.go
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2018 The Kubernetes 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package connrotation
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestCloseAll(t *testing.T) {
|
||||||
|
closed := make(chan struct{})
|
||||||
|
dialFn := func(ctx context.Context, network, address string) (net.Conn, error) {
|
||||||
|
return closeOnlyConn{onClose: func() { closed <- struct{}{} }}, nil
|
||||||
|
}
|
||||||
|
dialer := NewDialer(dialFn)
|
||||||
|
|
||||||
|
const numConns = 10
|
||||||
|
|
||||||
|
// Outer loop to ensure Dialer is re-usable after CloseAll.
|
||||||
|
for i := 0; i < 5; i++ {
|
||||||
|
for j := 0; j < numConns; j++ {
|
||||||
|
if _, err := dialer.Dial("", ""); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dialer.CloseAll()
|
||||||
|
for j := 0; j < numConns; j++ {
|
||||||
|
select {
|
||||||
|
case <-closed:
|
||||||
|
case <-time.After(time.Second):
|
||||||
|
t.Fatalf("iteration %d: 1s after CloseAll only %d/%d connections closed", i, j, numConns)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type closeOnlyConn struct {
|
||||||
|
net.Conn
|
||||||
|
onClose func()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c closeOnlyConn) Close() error {
|
||||||
|
go c.onClose()
|
||||||
|
return nil
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user