Merge pull request #4291 from oasisprotocol/kostko/stable/21.2.x/back…

…port-4290 [BACKPORT/21.2.x] go/worker/storage: Fix potential memory leak through context
oasisprotocol · Oct 1, 2021 · e6bd05f · e6bd05f
2 parents d1b69f5 + 935093b
commit e6bd05f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.changelog/4290.bugfix.md b/.changelog/4290.bugfix.md
@@ -0,0 +1 @@
+go/worker/storage: Fix potential memory leak through context
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
@@ -9,7 +9,7 @@ ARG GO_PROTOC_GEN_GO_VERSION=1.21.0
 ARG GOLANGCILINT_VERSION=1.41.1
 ARG GOCOVMERGE_VERSION=b5bfa59ec0adc420475f97f89b58045c721d761c
 ARG GOFUMPT_VERSION=v0.1.1
-ARG RUST_NIGHTLY_VERSION=2021-05-20
+ARG RUST_NIGHTLY_VERSION=2021-08-17
 ARG JEMALLOC_VERSION=5.2.1
 ARG JEMALLOC_CHECKSUM=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6
 

diff --git a/go/worker/storage/committee/node.go b/go/worker/storage/committee/node.go
@@ -529,9 +529,12 @@ func (n *Node) fetchDiff(round uint64, prevRoot, thisRoot storageApi.Root) {
 				"new_root", thisRoot,
 			)
 
+			ctx, cancel := context.WithCancel(n.ctx)
+			defer cancel()
+
 			// Prioritize committee nodes.
 			var selectedNode *node.Node
-			ctx := storageApi.WithNodeSelectionCallback(n.ctx, func(n *node.Node) {
+			ctx = storageApi.WithNodeSelectionCallback(ctx, func(n *node.Node) {
 				selectedNode = n
 			})
 			if committee := n.commonNode.Group.GetEpochSnapshot().GetStorageCommittee(); committee != nil {

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2021-05-20
+nightly-2021-08-17
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		go/worker/storage: Fix potential memory leak through context