From cee11356ab4524cde49965ba41f3da343169a745 Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Mon, 24 Feb 2025 14:23:50 -0500 Subject: [PATCH] deps: update go-msgpack and net-rpc-msgpackrpc (#25201) Fixes a bug where connections would not be closed on write errors in the msgpack encoder, which would cause the reader end of RPC connections to hang indefinitely. This resulted in clients in widely-distributed geographies being unable to poll for allocation updates. Fixes: https://github.com/hashicorp/nomad/issues/23305 --- .changelog/25201.txt | 3 +++ go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .changelog/25201.txt diff --git a/.changelog/25201.txt b/.changelog/25201.txt new file mode 100644 index 000000000..36787750f --- /dev/null +++ b/.changelog/25201.txt @@ -0,0 +1,3 @@ +```release-note:bug +rpc: Fixed a bug that would cause the reader side of RPC connections to hang indefinitely +``` diff --git a/go.mod b/go.mod index 6a37d586a..1a1d06f71 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/hashicorp/go-kms-wrapping/wrappers/transit/v2 v2.0.13 github.com/hashicorp/go-memdb v1.3.4 github.com/hashicorp/go-metrics v0.5.4 - github.com/hashicorp/go-msgpack/v2 v2.1.2 + github.com/hashicorp/go-msgpack/v2 v2.1.3 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-netaddrs v0.1.0 github.com/hashicorp/go-plugin v1.6.2 @@ -80,7 +80,7 @@ require ( github.com/hashicorp/hcl/v2 v2.20.2-0.20240517235513-55d9c02d147d github.com/hashicorp/hil v0.0.0-20210521165536-27a72121fd40 github.com/hashicorp/memberlist v0.5.3 - github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0 + github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.1 github.com/hashicorp/nomad/api v0.0.0-20230103221135-ce00d683f9be github.com/hashicorp/raft v1.7.2 github.com/hashicorp/raft-autopilot v0.1.6 diff --git a/go.sum b/go.sum index 43ff9b20a..bd69d8eb9 100644 --- a/go.sum +++ b/go.sum @@ -1218,8 +1218,8 @@ github.com/hashicorp/go-metrics v0.5.4/go.mod h1:CG5yz4NZ/AI/aQt9Ucm/vdBnbh7fvmv github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v1.1.6-0.20240304204939-8824e8ccc35f h1:/xqzTen8ftnKv3cKa87WEoOLtsDJYFU0ArjrKaPTTkc= github.com/hashicorp/go-msgpack v1.1.6-0.20240304204939-8824e8ccc35f/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4= -github.com/hashicorp/go-msgpack/v2 v2.1.2 h1:4Ee8FTp834e+ewB71RDrQ0VKpyFdrKOjvYtnQ/ltVj0= -github.com/hashicorp/go-msgpack/v2 v2.1.2/go.mod h1:upybraOAblm4S7rx0+jeNy+CWWhzywQsSRV5033mMu4= +github.com/hashicorp/go-msgpack/v2 v2.1.3 h1:cB1w4Zrk0O3jQBTcFMKqYQWRFfsSQ/TYKNyUUVyCP2c= +github.com/hashicorp/go-msgpack/v2 v2.1.3/go.mod h1:SjlwKKFnwBXvxD/I1bEcfJIBbEJ+MCUn39TxymNR5ZU= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= @@ -1282,8 +1282,8 @@ github.com/hashicorp/mdns v1.0.5 h1:1M5hW1cunYeoXOqHwEb/GBDDHAFo0Yqb/uz/beC6LbE= github.com/hashicorp/mdns v1.0.5/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.5.3 h1:tQ1jOCypD0WvMemw/ZhhtH+PWpzcftQvgCorLu0hndk= github.com/hashicorp/memberlist v0.5.3/go.mod h1:h60o12SZn/ua/j0B6iKAZezA4eDaGsIuPO70eOaJ6WE= -github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0 h1:kBpVVl1sl3MaSrs97e0+pDQhSrqJv9gVbSUrPpVfl1w= -github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0/go.mod h1:6pdNz0vo0mF0GvhwDG56O3N18qBrAz/XRIcfINfTbwo= +github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.1 h1:Y1sd8ZCCUUlUetCk+3MCpOwdWd+WicHdk2zk2yUM0qw= +github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.1/go.mod h1:wASEfI5dofjm9S9Jp3JM4pfoBZy8Z07JUE2wHNi0zuc= github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM= github.com/hashicorp/raft v1.2.0/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= github.com/hashicorp/raft v1.7.2 h1:pyvxhfJ4R8VIAlHKvLoKQWElZspsCVT6YWuxVxsPAgc=