Skip to content

Commit cb5f55c

Browse files
committed
fix concurrent map access
Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>
1 parent ca03272 commit cb5f55c

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

etcdutl/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ replace (
1515
// Bad imports are sometimes causing attempts to pull that code.
1616
// This makes the error more explicit.
1717
replace (
18-
go.etcd.io/bbolt => github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b
18+
go.etcd.io/bbolt => github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95
1919

2020
go.etcd.io/etcd => ./FORBIDDEN_DEPENDENCY
2121
go.etcd.io/etcd/v3 => ./FORBIDDEN_DEPENDENCY

etcdutl/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
9595
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
9696
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
9797
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
98-
github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b h1:KB9P9IOfPIaoOke+Z2wRsBcDTnHP4J7XXN9W8i+ra1g=
99-
github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b/go.mod h1:e1yDoFW4FqDyBPjBvNOfQCT2XX2A9XRq82knHLii+/E=
98+
github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95 h1:9GcNTYwy64wQHKk4A6NXiSXulb6i1FEH4BlKEKMuIuY=
99+
github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95/go.mod h1:e1yDoFW4FqDyBPjBvNOfQCT2XX2A9XRq82knHLii+/E=
100100
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA=
101101
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
102102
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.0
55
toolchain go1.24.7
66

77
replace (
8-
go.etcd.io/bbolt => github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b
8+
go.etcd.io/bbolt => github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95
99
go.etcd.io/etcd/api/v3 => ./api
1010
go.etcd.io/etcd/client/pkg/v3 => ./client/pkg
1111
go.etcd.io/etcd/client/v3 => ./client/v3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
138138
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
139139
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
140140
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
141-
github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b h1:KB9P9IOfPIaoOke+Z2wRsBcDTnHP4J7XXN9W8i+ra1g=
142-
github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b/go.mod h1:e1yDoFW4FqDyBPjBvNOfQCT2XX2A9XRq82knHLii+/E=
141+
github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95 h1:9GcNTYwy64wQHKk4A6NXiSXulb6i1FEH4BlKEKMuIuY=
142+
github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95/go.mod h1:e1yDoFW4FqDyBPjBvNOfQCT2XX2A9XRq82knHLii+/E=
143143
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA=
144144
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
145145
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=

server/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ require (
8080
)
8181

8282
replace (
83-
go.etcd.io/bbolt => github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b
83+
go.etcd.io/bbolt => github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95
8484

8585
go.etcd.io/etcd/api/v3 => ../api
8686
go.etcd.io/etcd/client/pkg/v3 => ../client/pkg

server/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
118118
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
119119
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
120120
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
121-
github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b h1:KB9P9IOfPIaoOke+Z2wRsBcDTnHP4J7XXN9W8i+ra1g=
122-
github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b/go.mod h1:e1yDoFW4FqDyBPjBvNOfQCT2XX2A9XRq82knHLii+/E=
121+
github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95 h1:9GcNTYwy64wQHKk4A6NXiSXulb6i1FEH4BlKEKMuIuY=
122+
github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95/go.mod h1:e1yDoFW4FqDyBPjBvNOfQCT2XX2A9XRq82knHLii+/E=
123123
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA=
124124
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
125125
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=

tests/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.0
55
toolchain go1.24.7
66

77
replace (
8-
go.etcd.io/bbolt => github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b
8+
go.etcd.io/bbolt => github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95
99

1010
go.etcd.io/etcd/api/v3 => ../api
1111
go.etcd.io/etcd/client/pkg/v3 => ../client/pkg

tests/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
151151
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
152152
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
153153
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
154-
github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b h1:KB9P9IOfPIaoOke+Z2wRsBcDTnHP4J7XXN9W8i+ra1g=
155-
github.com/tjungblu/bbolt v0.0.0-20260210085802-a81f2af2c16b/go.mod h1:e1yDoFW4FqDyBPjBvNOfQCT2XX2A9XRq82knHLii+/E=
154+
github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95 h1:9GcNTYwy64wQHKk4A6NXiSXulb6i1FEH4BlKEKMuIuY=
155+
github.com/tjungblu/bbolt v0.0.0-20260210111131-96ecd91dbd95/go.mod h1:e1yDoFW4FqDyBPjBvNOfQCT2XX2A9XRq82knHLii+/E=
156156
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA=
157157
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
158158
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=

0 commit comments

Comments
 (0)