From a1164f11165ce9d931487d2be8179cf74a9c53a8 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 13:25:47 -0500 Subject: [PATCH 1/6] Support for transport dial timeouts (openziti/fabric#197) --- go.mod | 8 ++++---- go.sum | 2 ++ ziti-fabric-test/subcmd/loop2/dialer.go | 2 +- ziti-fabric-test/subcmd/loop3/dialer.go | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index b327a49ff..fd911e112 100644 --- a/go.mod +++ b/go.mod @@ -2,15 +2,15 @@ module github.com/openziti/ziti go 1.15 -//replace github.com/openziti/foundation => ../foundation +replace github.com/openziti/foundation => ../foundation //replace github.com/michaelquigley/dilithium => ../../q/research/dilithium -//replace github.com/openziti/fabric => ../fabric +replace github.com/openziti/fabric => ../fabric //replace github.com/openziti/sdk-golang => ../sdk-golang -//replace github.com/openziti/edge => ../edge +replace github.com/openziti/edge => ../edge require ( github.com/Jeffail/gabs v1.4.0 @@ -27,7 +27,7 @@ require ( github.com/michaelquigley/pfxlog v0.3.7 github.com/openziti/edge v0.19.10 github.com/openziti/fabric v0.16.14 - github.com/openziti/foundation v0.15.22 + github.com/openziti/foundation v0.15.23 github.com/openziti/sdk-golang v0.15.17 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index f929c2dc2..77bdea3dd 100644 --- a/go.sum +++ b/go.sum @@ -617,6 +617,8 @@ github.com/openziti/fabric v0.16.14/go.mod h1:WpPkQ3LV5TeTzM95APPORBhfTxELxvcMVS github.com/openziti/foundation v0.15.21/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/foundation v0.15.22 h1:t87jxnWHAtvqPZwpaHhKu0pDHGMVaJ2SuJLAA0i55e0= github.com/openziti/foundation v0.15.22/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= +github.com/openziti/foundation v0.15.23 h1:ZGVUcktC3HmEaradjwqjLETMysT8FG69GmYbBy6+3UY= +github.com/openziti/foundation v0.15.23/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/sdk-golang v0.15.17 h1:pwztxkMbZmjyGgsjKHgEzrHf8mXyGIM8JRmeVPlFP1g= github.com/openziti/sdk-golang v0.15.17/go.mod h1:022SpRRS9cl6AWmS/K0Df34ovurQGqvPJ6VSQrwE5BI= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= diff --git a/ziti-fabric-test/subcmd/loop2/dialer.go b/ziti-fabric-test/subcmd/loop2/dialer.go index 5e7b90391..62f7541e8 100644 --- a/ziti-fabric-test/subcmd/loop2/dialer.go +++ b/ziti-fabric-test/subcmd/loop2/dialer.go @@ -202,7 +202,7 @@ func (cmd *dialerCmd) connect() net.Conn { } func dialDirect(endpoint transport.Address, id *identity.TokenId) (net.Conn, error) { - peer, err := endpoint.Dial("loop", id, nil) + peer, err := endpoint.Dial("loop", id, 0, nil) if err != nil { return nil, err } diff --git a/ziti-fabric-test/subcmd/loop3/dialer.go b/ziti-fabric-test/subcmd/loop3/dialer.go index f9c4bf156..cfa549763 100644 --- a/ziti-fabric-test/subcmd/loop3/dialer.go +++ b/ziti-fabric-test/subcmd/loop3/dialer.go @@ -202,7 +202,7 @@ func (cmd *dialerCmd) connect() net.Conn { } func dialDirect(endpoint transport.Address, id *identity.TokenId) (net.Conn, error) { - peer, err := endpoint.Dial("loop", id, nil) + peer, err := endpoint.Dial("loop", id, 0, nil) if err != nil { return nil, err } From b6fa98e7d08cc9bed86a019d13ae4218ffe77c1f Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 13:52:05 -0500 Subject: [PATCH 2/6] Timeout value for testing. (openziti/fabric#197) --- etc/003.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/003.yml b/etc/003.yml index d4c7b515b..e21ee86ea 100644 --- a/etc/003.yml +++ b/etc/003.yml @@ -36,3 +36,4 @@ dialers: retransmission: true randomDrops: false drop1InN: 5000 + connectTimeout: 2s From 8525048717c3e986d82b751a90b8ac168099c3ff Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 16:30:09 -0500 Subject: [PATCH 3/6] Update dependencies for Xgress dial timeout. (openziti/fabric#197) --- go.mod | 12 ++++++------ go.sum | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index fd911e112..4158b7ae2 100644 --- a/go.mod +++ b/go.mod @@ -2,15 +2,15 @@ module github.com/openziti/ziti go 1.15 -replace github.com/openziti/foundation => ../foundation +//replace github.com/openziti/foundation => ../foundation //replace github.com/michaelquigley/dilithium => ../../q/research/dilithium -replace github.com/openziti/fabric => ../fabric +//replace github.com/openziti/fabric => ../fabric //replace github.com/openziti/sdk-golang => ../sdk-golang -replace github.com/openziti/edge => ../edge +//replace github.com/openziti/edge => ../edge require ( github.com/Jeffail/gabs v1.4.0 @@ -25,9 +25,9 @@ require ( github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.7 - github.com/openziti/edge v0.19.10 - github.com/openziti/fabric v0.16.14 - github.com/openziti/foundation v0.15.23 + github.com/openziti/edge v0.19.13 + github.com/openziti/fabric v0.16.15 + github.com/openziti/foundation v0.15.24 github.com/openziti/sdk-golang v0.15.17 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 77bdea3dd..8eb3de345 100644 --- a/go.sum +++ b/go.sum @@ -447,6 +447,8 @@ github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqo github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR77jAZG3Y3bsb8hF6fHJbFoyFukLFOkQ98S0pQz3xw= github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943 h1:REP5ibuxEIcBcG837UAei093pVqmOPm/tw0TbUd18YI= github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs= +github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA= +github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -534,6 +536,8 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo= +github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= @@ -541,6 +545,9 @@ github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZ github.com/mdlayher/netlink v1.2.0/go.mod h1:kwVW1io0AZy9A1E2YYgaD4Cj+C+GPkU6klXCMzIJ9p8= github.com/mdlayher/netlink v1.2.1 h1:Q5xDCtos3xv72vqzjuAh5Ns/IUlFfoy+948yBNSktTc= github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= +github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= +github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys= +github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/michaelquigley/dilithium v0.2.0 h1:JNVb9ckXDTAxYVpPHPzkBuXObh0TYymuZgAhZclcvAo= @@ -612,13 +619,17 @@ github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTm github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openziti/edge v0.19.10 h1:7NASZ0b/L/X+eBycwvZIhD63i4MxNxrvRp8jp6oRq8Q= github.com/openziti/edge v0.19.10/go.mod h1:IYJ9PTAqA/Xqgp9ZhAfQseCUSJo4q1FhSZtxE9avAr8= +github.com/openziti/edge v0.19.13 h1:QQYYMoE1Zp6kFY3e2qYcLFx7fFUCaWhLwkWBpEwsQpQ= +github.com/openziti/edge v0.19.13/go.mod h1:oclw2QrJrS3DzXrr9VdfZ9OLIR6IA0BloI177y2CRWE= github.com/openziti/fabric v0.16.14 h1:5gD3THd4d0rq+MscJWSzrUKsy6BEuiEbnRU7YDtUUhQ= github.com/openziti/fabric v0.16.14/go.mod h1:WpPkQ3LV5TeTzM95APPORBhfTxELxvcMVSfuTXpheJU= +github.com/openziti/fabric v0.16.15/go.mod h1:09dVpKk1p45gGEv5GCnIxaQkpqaIyjEfZMZgTWhmM+k= github.com/openziti/foundation v0.15.21/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/foundation v0.15.22 h1:t87jxnWHAtvqPZwpaHhKu0pDHGMVaJ2SuJLAA0i55e0= github.com/openziti/foundation v0.15.22/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/foundation v0.15.23 h1:ZGVUcktC3HmEaradjwqjLETMysT8FG69GmYbBy6+3UY= github.com/openziti/foundation v0.15.23/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= +github.com/openziti/foundation v0.15.24/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/sdk-golang v0.15.17 h1:pwztxkMbZmjyGgsjKHgEzrHf8mXyGIM8JRmeVPlFP1g= github.com/openziti/sdk-golang v0.15.17/go.mod h1:022SpRRS9cl6AWmS/K0Df34ovurQGqvPJ6VSQrwE5BI= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= @@ -1001,6 +1012,9 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061 h1:DQmQoKxQWtyybCtX/3dIuDBcAhFszqq8YiNeS6sNu1c= golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1064,6 +1078,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= From e4340d13e93eeace0bb66b2a001e0cf2c359d607 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 16:31:19 -0500 Subject: [PATCH 4/6] go mod tidy --- go.sum | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/go.sum b/go.sum index 8eb3de345..d97434c23 100644 --- a/go.sum +++ b/go.sum @@ -448,6 +448,7 @@ github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR7 github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943 h1:REP5ibuxEIcBcG837UAei093pVqmOPm/tw0TbUd18YI= github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs= github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA= +github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b h1:c3NTyLNozICy8B4mlMXemD3z/gXgQzVXZS/HqT+i3do= github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -536,7 +537,9 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY= github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo= +github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0= github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= @@ -547,6 +550,7 @@ github.com/mdlayher/netlink v1.2.1 h1:Q5xDCtos3xv72vqzjuAh5Ns/IUlFfoy+948yBNSktT github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys= +github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0= github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= @@ -617,18 +621,12 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openziti/edge v0.19.10 h1:7NASZ0b/L/X+eBycwvZIhD63i4MxNxrvRp8jp6oRq8Q= -github.com/openziti/edge v0.19.10/go.mod h1:IYJ9PTAqA/Xqgp9ZhAfQseCUSJo4q1FhSZtxE9avAr8= github.com/openziti/edge v0.19.13 h1:QQYYMoE1Zp6kFY3e2qYcLFx7fFUCaWhLwkWBpEwsQpQ= github.com/openziti/edge v0.19.13/go.mod h1:oclw2QrJrS3DzXrr9VdfZ9OLIR6IA0BloI177y2CRWE= -github.com/openziti/fabric v0.16.14 h1:5gD3THd4d0rq+MscJWSzrUKsy6BEuiEbnRU7YDtUUhQ= -github.com/openziti/fabric v0.16.14/go.mod h1:WpPkQ3LV5TeTzM95APPORBhfTxELxvcMVSfuTXpheJU= +github.com/openziti/fabric v0.16.15 h1:NKlQF6YjnRD3XL9KZdIcgw0PSo5TzS/JYZrbsDQTaJA= github.com/openziti/fabric v0.16.15/go.mod h1:09dVpKk1p45gGEv5GCnIxaQkpqaIyjEfZMZgTWhmM+k= github.com/openziti/foundation v0.15.21/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= -github.com/openziti/foundation v0.15.22 h1:t87jxnWHAtvqPZwpaHhKu0pDHGMVaJ2SuJLAA0i55e0= -github.com/openziti/foundation v0.15.22/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= -github.com/openziti/foundation v0.15.23 h1:ZGVUcktC3HmEaradjwqjLETMysT8FG69GmYbBy6+3UY= -github.com/openziti/foundation v0.15.23/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= +github.com/openziti/foundation v0.15.24 h1:51+14rNoOnHQA22BWfWVc7ClIFCHNvtEHbPxr96NdBQ= github.com/openziti/foundation v0.15.24/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/sdk-golang v0.15.17 h1:pwztxkMbZmjyGgsjKHgEzrHf8mXyGIM8JRmeVPlFP1g= github.com/openziti/sdk-golang v0.15.17/go.mod h1:022SpRRS9cl6AWmS/K0Df34ovurQGqvPJ6VSQrwE5BI= @@ -1014,6 +1012,7 @@ golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061 h1:DQmQoKxQWtyybCtX/3dIuDBcA golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65 h1:pTMjDVnP5eVRRlWO76rEWJ8JoC6Lf1CmyjPZXRiy2Sw= golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1078,6 +1077,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= From 4e7e1ea1a469f07b1d8f8c6c69cf3371e9037e58 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 16:33:39 -0500 Subject: [PATCH 5/6] CHANGELOG. --- CHANGELOG.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 655e35ea9..45e3691bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +# Release 0.19.5 + +## What's New + +* Support configurable timeout on Xgress dial operations. Router terminated services can now specify a short timeout for dial operations. + +## Xgress Dial Timeout + +Specify the dial timeout for Xgress dialers using the following syntax: + +``` +dialers: + - binding: transport + options: + connectTimeout: 2s +``` + +You will need to specify Xgress options for each dialer binding that you want to use with your configuration. + # Release 0.19.4 ## What's New From 1df6104dbab7b246418d9dfa1ae7f8ea0ac06607 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 16:39:48 -0500 Subject: [PATCH 6/6] ->0.19.4 --- CHANGELOG.md | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45e3691bd..b1e795f4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,27 +1,9 @@ -# Release 0.19.5 - -## What's New - -* Support configurable timeout on Xgress dial operations. Router terminated services can now specify a short timeout for dial operations. - -## Xgress Dial Timeout - -Specify the dial timeout for Xgress dialers using the following syntax: - -``` -dialers: - - binding: transport - options: - connectTimeout: 2s -``` - -You will need to specify Xgress options for each dialer binding that you want to use with your configuration. - # Release 0.19.4 ## What's New * Link latency probe timeout parameter in router configuration. +* Support configurable timeout on Xgress dial operations. Router terminated services can now specify a short timeout for dial operations. * Fix 0.19 regression: updating terminator cost/precedence from the sdk was broken * Fix 0.19 regression: fabric session client id was incorrectly set to edge session token instead of id @@ -39,6 +21,19 @@ forwarder: latencyProbeTimeout: 10000 ``` +## Xgress Dial Timeout + +Specify the dial timeout for Xgress dialers using the following syntax: + +``` +dialers: + - binding: transport + options: + connectTimeout: 2s +``` + +You will need to specify Xgress options for each dialer binding that you want to use with your configuration. + # Release 0.19.3 ## What's New