Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump github.com/containerd/containerd from 1.6.18 to 1.6.26 #4664

Merged
merged 1 commit into from
Feb 6, 2024

Conversation

denyeart
Copy link
Contributor

@denyeart denyeart commented Feb 2, 2024

Bump github.com/containerd/containerd from 1.6.18 to 1.6.26
Only move golang.org/x/tools to v0.14.0 (later versions introduce an issue with ./scripts/metrics_doc.sh check)
Only move google.golang.org/protobuf to v1.31.0 (later versions introduce an issue with chaincode build)

Update tests to reflect message updates in latest grpc v1.61.0.

@denyeart denyeart requested a review from a team as a code owner February 2, 2024 19:04
@denyeart denyeart force-pushed the containerd_tools branch 2 times, most recently from c0f2eb4 to f244a5b Compare February 5, 2024 15:16
@denyeart denyeart marked this pull request as draft February 5, 2024 16:47
@pfi79
Copy link
Contributor

pfi79 commented Feb 5, 2024

#4668 (comment)

@pfi79
Copy link
Contributor

pfi79 commented Feb 5, 2024

#4668 (comment)

@denyeart denyeart force-pushed the containerd_tools branch 4 times, most recently from fe3a112 to e6f80f6 Compare February 5, 2024 20:52
@@ -1643,7 +1643,8 @@ var _ = Describe("EndToEnd Smart BFT configuration test", func() {
// If backoff's default settings are left, it will take 20-25 seconds after the 7th attempt to reach the 8th attempt.
// If the backoff is made controllable, as here in the test, the maximum time between attempts will be 3 seconds.
for i := 0; i < 7; i++ {
Eventually(ordererRunners[0].Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("pickfirstBalancer: UpdateSubConnState.*IDLE connection error"))
// look for grpc Info message
Eventually(ordererRunners[0].Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("Received SubConn state update.*IDLE connection error"))
Copy link
Contributor

@pfi79 pfi79 Feb 5, 2024

Choose a reason for hiding this comment

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

IDLE ConnectionError

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you. Relying on these log messages is fragile!

Copy link
Contributor

Choose a reason for hiding this comment

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

Totally agree with you.
But I can't think of any other way to show and prove that there are problems with an unconfigured backoff grpc.

@pfi79
Copy link
Contributor

pfi79 commented Feb 5, 2024

integration/gateway/gateway_bft_test.go line 183
need to be replaced

"%s, \\{READY"

on

"%s, \\{ConnectivityState:READY"

@denyeart
Copy link
Contributor Author

denyeart commented Feb 5, 2024

integration/gateway/gateway_bft_test.go line 183 need to be replaced

"%s, \\{READY"

on

"%s, \\{ConnectivityState:READY"

Ah yes, hopefully this is the last one.

@@ -113,7 +113,7 @@ var _ = Describe("GatewayService with BFT ordering service", func() {
os.RemoveAll(testDir)
})

It("Submit transaction", func() {
FIt("Submit transaction", func() {
Copy link
Contributor

@pfi79 pfi79 Feb 5, 2024

Choose a reason for hiding this comment

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

Maybe we should put `It' back in.
or
GINKGO_EDITOR_INTEGRATION=true before running focus test

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ready to go now, thanks for the help!

Bump github.com/containerd/containerd from 1.6.18 to 1.6.26
Only move golang.org/x/tools to v0.14.0 (later versions introduce an issue with ./scripts/metrics_doc.sh check)
Only move google.golang.org/protobuf to v1.31.0 (later versions introduce an issue with chaincode build)

Update tests to reflect message updates in latest grpc v1.61.0.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
@ale-linux ale-linux merged commit dd1c4da into hyperledger:main Feb 6, 2024
14 checks passed
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.

3 participants