Remove usage of go-ieproxy for windows (#10009)
There is a potential for deadlock on Windows 10 refer https://github.com/mattn/go-ieproxy/issues/17 remove this dependency for now.
This commit is contained in:
@@ -185,6 +185,7 @@ func lock(ds *Dsync, locks *[]string, id, source string, isReadLock bool, lockNa
|
||||
|
||||
g := Granted{index: index}
|
||||
if c == nil {
|
||||
log("lock: nil locker")
|
||||
ch <- g
|
||||
return
|
||||
}
|
||||
@@ -258,7 +259,10 @@ func lock(ds *Dsync, locks *[]string, id, source string, isReadLock bool, lockNa
|
||||
// timeout happened, maybe one of the nodes is slow, count
|
||||
// number of locks to check whether we have quorum or not
|
||||
if !quorumMet(locks, isReadLock, dquorum, dquorumReads) {
|
||||
log("Quorum not met after timeout")
|
||||
releaseAll(ds, locks, isReadLock, restClnts, lockNames...)
|
||||
} else {
|
||||
log("Quorum met after timeout")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -21,8 +21,6 @@ import (
|
||||
"net"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/mattn/go-ieproxy"
|
||||
)
|
||||
|
||||
// DefaultTransport - this default transport is similar to
|
||||
@@ -30,7 +28,7 @@ import (
|
||||
// is set to true to avoid decompressing content with 'gzip' encoding.
|
||||
var DefaultTransport = func(secure bool) http.RoundTripper {
|
||||
tr := &http.Transport{
|
||||
Proxy: ieproxy.GetProxyFunc(),
|
||||
Proxy: http.ProxyFromEnvironment,
|
||||
DialContext: (&net.Dialer{
|
||||
Timeout: 5 * time.Second,
|
||||
KeepAlive: 15 * time.Second,
|
||||
|
||||
Reference in New Issue
Block a user