Skip to content

vendor: update go.etcd.io/bbolt v1.3.4#4134

Merged
crosbymichael merged 1 commit intocontainerd:masterfrom
thaJeztah:bump_bbolt
Mar 30, 2020
Merged

vendor: update go.etcd.io/bbolt v1.3.4#4134
crosbymichael merged 1 commit intocontainerd:masterfrom
thaJeztah:bump_bbolt

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Mar 30, 2020

EDIT (by @AkihiroSuda): this was reverted in #4156


full diff: etcd-io/bbolt@v1.3.3...v1.3.4

  • Fix unsafe pointer conversions caught by Go 1.14 checkptr
  • Fix unexpected delete bucket error: "delete bucket: incompatible value"
  • Add support for aix
  • Add go.mod
  • db.Path() resolves to db.file.Name()

As mentioned in #4050 (comment) - this update fixes issues when using Go 1.14 / revealed by Go 1.14

full diff: etcd-io/bbolt@v1.3.3...v1.3.4

- Fix unsafe pointer conversions caught by Go 1.14 checkptr
- Fix unexpected delete bucket error: "delete bucket: incompatible value"
- Add support for aix
- Add go.mod
- db.Path() resolves to db.file.Name()

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Mar 30, 2020

Build succeeded.

@dims
Copy link
Copy Markdown
Member

dims commented Mar 30, 2020

@thaJeztah so the plan is to upgrade this package first get a clean run in Go 1.13 and then move to Go 1.14?

@thaJeztah
Copy link
Copy Markdown
Member Author

@dims partially, yes: IIUC there's more changes needed to make Go 1.14 work (https://twitter.com/_AkihiroSuda_/status/1242567902156357632?s=20), so at least making sure we get changes in that may be needed to update.

@dims
Copy link
Copy Markdown
Member

dims commented Mar 30, 2020

@thaJeztah sounds good! watching this space as we have to bump go in k/k as well kubernetes/kubernetes#88638 ( which means we will need to be able to work with bbolt dependency from both contianerd and etcd )

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit a83927d into containerd:master Mar 30, 2020
@thaJeztah thaJeztah deleted the bump_bbolt branch April 2, 2020 16:34
AkihiroSuda added a commit to AkihiroSuda/containerd that referenced this pull request Jun 22, 2020
We had once updated bbolt from v1.3.3 to v1.3.4 in containerd#4134,
but reverted to v1.3.3 in containerd#4156 due to "fatal error: sweep increased
allocation count" (etcd-io/bbolt#214).

The issue was fixed in bbolt v1.3.5 (etcd-io/bbolt#220).

Signed-off-by: Akihiro Suda <[email protected]>
fahedouch pushed a commit to fahedouch/containerd that referenced this pull request Aug 7, 2020
We had once updated bbolt from v1.3.3 to v1.3.4 in containerd#4134,
but reverted to v1.3.3 in containerd#4156 due to "fatal error: sweep increased
allocation count" (etcd-io/bbolt#214).

The issue was fixed in bbolt v1.3.5 (etcd-io/bbolt#220).

Signed-off-by: Akihiro Suda <[email protected]>
tussennet pushed a commit to tussennet/containerd that referenced this pull request Sep 11, 2020
We had once updated bbolt from v1.3.3 to v1.3.4 in containerd#4134,
but reverted to v1.3.3 in containerd#4156 due to "fatal error: sweep increased
allocation count" (etcd-io/bbolt#214).

The issue was fixed in bbolt v1.3.5 (etcd-io/bbolt#220).

Signed-off-by: Akihiro Suda <[email protected]>
AkihiroSuda added a commit to AkihiroSuda/containerd that referenced this pull request Nov 10, 2020
We had once updated bbolt from v1.3.3 to v1.3.4 in containerd#4134,
but reverted to v1.3.3 in containerd#4156 due to "fatal error: sweep increased
allocation count" (etcd-io/bbolt#214).

The issue was fixed in bbolt v1.3.5 (etcd-io/bbolt#220).

Signed-off-by: Akihiro Suda <[email protected]>
(cherry picked from commit bebfbab)
Signed-off-by: Akihiro Suda <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants