Skip to content
This repository has been archived by the owner on Dec 16, 2022. It is now read-only.

Cherry pick changes into our build #133

Merged
merged 4 commits into from
Jun 5, 2019

Conversation

setassociative
Copy link

This forks our 2019-04-02 build and "cherry picks" in the following changes:

  1. Adds timeouts for all kinds of statements. Power to the clients! vitessio/vitess#4824 — Respect timeouts in all statements
  2. properly suppress begin...commit in autocommit logs vitessio/vitess#4827 — Correctly suppress begin...commit in auto-commit logs
  3. add optional tag-based filtering for query logging vitessio/vitess#4895 — Adds optional tag-based query logging
  4. bootstrap.sh: Remove unused unused command. vitessio/vitess#4891 — fix build due to broken dependency

I squashed commits 2 and 3 each into a single commit on this branch. Item 2 did not apply cleanly so I had to manually resolve merge conflicts.

Once this merge is approved we will reset our master branch to point here and tag the old master branch so that it's not lost should we need to recover that state:

git checkout tinyspeck/master
git tag slack-vitess-2019.06.05
git reset --hard slack-vitess-2019.04.02.r1
git push -f tinyspeck

When it's time to sync back up with upstream we'll revert the 4 comments above and then merge vitessio/vitess master.

rafael and others added 4 commits June 5, 2019 09:22
Original Message:
The previous (untested) implementation turned out to be in the wrong
place in the TabletServer execution tier and did not properly log
the actual statements being executed.

Implement this the right way by returning the statements that were
really executed out from the TxPool, then using those to determine
whether or not to log the statement.

Original PR: vitessio#4827
The deprecated `unused` command has been removed from the source
repository, so this now fails. We no longer use `unused` so we can just
drop the line that tries to install it.

Signed-off-by: Anthony Yeh <[email protected]>
Copy link

@rafael rafael left a comment

Choose a reason for hiding this comment

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

LGTM +1

@setassociative setassociative merged commit e678010 into slack-vitess-2019.04.02.r1 Jun 5, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants