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

backport-2.1: storage: improve consistency checker diff, add debug decode-key #29033

Merged
merged 2 commits into from
Aug 27, 2018

Conversation

tbg
Copy link
Member

@tbg tbg commented Aug 24, 2018

Backport 2/2 commits from #29012.

/cc @cockroachdb/release


Avoid spilling non-printable characters and generally garbage into the
logs.

Release note: None

@tbg tbg requested a review from a team as a code owner August 24, 2018 08:40
@tbg tbg requested a review from a team August 24, 2018 08:40
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@a-robinson a-robinson left a comment

Choose a reason for hiding this comment

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

LGTM

tbg added 2 commits August 27, 2018 12:46
Avoid spilling non-printable characters and generally garbage into the
logs.

Improve legibility and make sure that the printed key
value pair works for `./cockroach debug decode-key`.

Release note: None
Inspired by cockroachdb#28995, where I needed this.

Release note: None
@tbg tbg force-pushed the backport2.1-29012 branch from f966180 to b4aa564 Compare August 27, 2018 10:47
@tbg
Copy link
Member Author

tbg commented Aug 27, 2018

TFTR!

bors r=a-robinson

@craig
Copy link
Contributor

craig bot commented Aug 27, 2018

Build failed

@tbg
Copy link
Member Author

tbg commented Aug 27, 2018

Flake filed as #29096

bors r=a-robinson

@craig
Copy link
Contributor

craig bot commented Aug 27, 2018

Build failed

@tbg
Copy link
Member Author

tbg commented Aug 27, 2018

Hmm, timeout again:

authentication_test.go:458: good login got error Post https://127.0.0.1:40233/login: net/http: request canceled (Client.Timeout exceeded while awaiting headers), wanted no error

The test might need to be fixed. I doubt I touched this in this PR, but I did touch the package so it's getting stressed.

@tbg
Copy link
Member Author

tbg commented Aug 27, 2018

Hmm, I didn't actually. Let me take a look.

@tbg
Copy link
Member Author

tbg commented Aug 27, 2018

I verified that it flakes without this patch too, so I'll leave the flake open. There's a 10s http client timeout that may just be too low, though it's not clear to me why it would start failing now.

bors r=a-robinson

craig bot pushed a commit that referenced this pull request Aug 27, 2018
29033: backport-2.1: storage: improve consistency checker diff, add debug decode-key r=a-robinson a=tschottdorf

Backport 2/2 commits from #29012.

/cc @cockroachdb/release

---

Avoid spilling non-printable characters and generally garbage into the
logs.

Release note: None


29082: backport-2.1: one week of merge PRs r=knz,tschottdorf a=benesch

Backport:
  * 1/1 commits from "sql: put rendered setting value in event log entry" (#29014)
  * 2/2 commits from " sql,settings: make SET CLUSTER SETTING wait for value to update, disallow in txn" (#29063)
  * 1/1 commits from "storage: discard a unworthwhile merge TODO" (#28885)
  * 3/3 commits from "storage: gate merges behind a cluster setting " (#28865)
  * 1/1 commits from "storage: update the tscache appropriately after a merge" (#28793)
  * 1/1 commits from "storage: avoid stopping twice in merge test" (#28902)
  * 1/1 commits from "roachpb,storage: rename GetSnapshotForMerge to Subsume" (#28910)
  * 1/1 commits from "build: fix generation rules for settings.html" (#28884)
  * 1/1 commits from "storage: deflake TestStoreRangeMergeTimestampCacheCausality" (#28928)
  * 1/1 commits from "storage: check for in-progress merge before installing new lease" (#28894)
  * 6/7 commits from " storage: enable merge queue by default" (#28961)

Please see individual PRs for details.

/cc @cockroachdb/release


Co-authored-by: Tobias Schottdorf <[email protected]>
Co-authored-by: David Taylor <[email protected]>
Co-authored-by: Nikhil Benesch <[email protected]>
@craig
Copy link
Contributor

craig bot commented Aug 27, 2018

Build succeeded

@craig craig bot merged commit b4aa564 into cockroachdb:release-2.1 Aug 27, 2018
@tbg tbg deleted the backport2.1-29012 branch August 27, 2018 13:11
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