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

diagnostics: Fixed a crashing bug when creating diagnostics report #104543

Merged
merged 1 commit into from
Jun 8, 2023

Conversation

Xiang-Gu
Copy link
Contributor

@Xiang-Gu Xiang-Gu commented Jun 7, 2023

This commit fixed a bug where the node would sometimes crash when creating diagnostics report.

Fixes: #104172
Epic: None
Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rafiss rafiss added backport-22.2.x backport-23.1.x Flags PRs that need to be backported to 23.1 labels Jun 7, 2023
Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @Xiang-Gu)


pkg/server/diagnostics/reporter_test.go line 43 at r1 (raw file):

	}

	reflectwalk.Walk(foo, stringRedactor{})

nit: check the error here

Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @Xiang-Gu)


pkg/server/diagnostics/reporter.go line 323 at r1 (raw file):

}

func (r *Reporter) collectSchemaInfo(ctx context.Context) ([]descpb.TableDescriptor, error) {

nit: leave a comment here that describes that the schematelemetry is a better data source.

This commit fixed a bug where the node would sometimes crash when
creating diagnostics report.

Release note: None
@Xiang-Gu Xiang-Gu force-pushed the report-crash-bug branch from fefac4a to eb60c01 Compare June 7, 2023 21:16
@Xiang-Gu Xiang-Gu marked this pull request as ready for review June 7, 2023 21:16
@Xiang-Gu Xiang-Gu requested a review from a team June 7, 2023 21:16
@Xiang-Gu
Copy link
Contributor Author

Xiang-Gu commented Jun 7, 2023

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Jun 7, 2023

This PR was included in a batch that successfully built, but then failed to merge into master. It will not be retried.

Additional information:

{"message":"Changes must be made through a pull request.","documentation_url":"https://docs.github.com/articles/about-protected-branches"}

@yuzefovich
Copy link
Member

bors r+ single on

@craig
Copy link
Contributor

craig bot commented Jun 8, 2023

Build failed:

@yuzefovich
Copy link
Member

Seems like unrelated flake.

bors r+ single on

@craig
Copy link
Contributor

craig bot commented Jun 8, 2023

Build succeeded:

@craig craig bot merged commit 2ab43c6 into cockroachdb:master Jun 8, 2023
@blathers-crl
Copy link

blathers-crl bot commented Jun 8, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from eb60c01 to blathers/backport-release-22.2-104543: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


error creating merge commit from eb60c01 to blathers/backport-release-23.1-104543: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

acceptance: TestDockerNodeJS is flaky
4 participants