luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Revert #13679 since TestCluster_ListenForRequest now fails intermittently in alarming ways. (#13714)

This commit is contained in:
Nick Cabatoff 2022-01-20 08:34:40 -05:00 committed by GitHub
parent 194c9e32d3
commit 4230749d9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/13679.txt
View File

@ -1,3 +0,0 @@
```release-note:bug
core: Fix how we report the cluster listener is done, prevents `bind: address already in use` errors.
```

6
vault/cluster/cluster.go
View File

@ -6,6 +6,8 @@ import (
"crypto/x509" "crypto/x509"
"errors" "errors"
"fmt" "fmt"
"github.com/hashicorp/vault/sdk/helper/certutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"net" "net"
"net/url" "net/url"
"os" "os"
@ -14,9 +16,7 @@ import (
"time" "time"
log "github.com/hashicorp/go-hclog" log "github.com/hashicorp/go-hclog"
"github.com/hashicorp/vault/sdk/helper/certutil"
"github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"golang.org/x/net/http2" "golang.org/x/net/http2"
) )
@ -279,9 +279,9 @@ func (cl *Listener) Run(ctx context.Context) error {
// Start our listening loop // Start our listening loop
go func(closeCh chan struct{}, tlsLn net.Listener) { go func(closeCh chan struct{}, tlsLn net.Listener) {
defer func() { defer func() {
cl.shutdownWg.Done()
tlsLn.Close() tlsLn.Close()
close(closeCh) close(closeCh)
cl.shutdownWg.Done()
}() }()
// baseDelay is the initial delay after an Accept() error before attempting again // baseDelay is the initial delay after an Accept() error before attempting again