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

Update to latest#4

Merged
guidoiaquinti merged 28 commits intomasterfrom
fork_sync
Mar 29, 2017
Merged

Update to latest#4
guidoiaquinti merged 28 commits intomasterfrom
fork_sync

Conversation

@guidoiaquinti
Copy link
Copy Markdown

Another merge of upstream

lvxin1986 and others added 28 commits February 9, 2017 16:03
fix the error : no java binary found
If I installed the java without yum or apt-get, but by setting the environment variable JAVA_HOME and PATH,the script with rise error :no java binary found

So we should consider the java binary installed manuelly
workflow: Add tutorial for resharding workflow for local environment.
1) fix typos in local env tutorial. Add the doc to left-menu
2) fix bug in error handling for vtworker's tasks
3) fix data racing issue in node.go

BUG=36510237
I also added an explanation why we're not vendoring these tools.
Bump minimum Go version from 1.7 to 1.8.
bootstrap.sh: Update path for "unused" tool.
…=false in the expected data.

Since vitessio#2613 we start to include negative boolean flags in the generated vtctl commands as well.

Since then the test failed and Travis runs after the merge failed (shard 4) e.g. https://travis-ci.org/youtube/vitess/jobs/215989088
test: vtctld_web_test.py: Change test data to include -<boolean flag>…
utils: Fix golint warnings and gofmt the file.
The previous parser changes explicitly disallowed constructs like:
SELECT...LIMIT UNION...

However, it turns out that 'some' people are using it. This change
accomodates such constructs without breaking the integrity of the
grammar.
@RyanGWU82
Copy link
Copy Markdown

👍

@guidoiaquinti guidoiaquinti merged commit ca16755 into master Mar 29, 2017
@guidoiaquinti guidoiaquinti deleted the fork_sync branch March 29, 2017 08:36
rafael pushed a commit that referenced this pull request Apr 3, 2020
rafael pushed a commit that referenced this pull request May 14, 2020
This is the 1st commit message:

VDiff ad-hoc version for slack

This is the commit message #2:

Removes extra log items

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #3:

Print actual position where it actually stop

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #4:

Fixes bug in filepos flavor

* Prior to this commit, flavorpos was using lexicographical comparison of the gtids.
  Thas was a bug in this context.

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #5:

Updates how master gtid position is obtained for file:pos flavor

When generating masterGTIDSet in file:pos most likely you will have a topology
like the following:

  Source A -> Target B (B has a vreplication stream from A)

From the target perspective, the source A is the master and you want to generate
a gtid that is based on binlog file position of that server.

As an example, let's see this topology:

  Master A -> Source B -> Target C (C has vreplication stream from B)

Prior to this change, masterGTIDSet was returning the binlogfile:pos of A. But
in reality, the Target C wants the position of B.

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #6:

Cleanup per review

* Address PR review + some other cleanup per linter

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
rafael pushed a commit that referenced this pull request Aug 13, 2020
This is the 1st commit message:

VDiff ad-hoc version for slack

This is the commit message #2:

Removes extra log items

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #3:

Print actual position where it actually stop

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #4:

Fixes bug in filepos flavor

* Prior to this commit, flavorpos was using lexicographical comparison of the gtids.
  Thas was a bug in this context.

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #5:

Updates how master gtid position is obtained for file:pos flavor

When generating masterGTIDSet in file:pos most likely you will have a topology
like the following:

  Source A -> Target B (B has a vreplication stream from A)

From the target perspective, the source A is the master and you want to generate
a gtid that is based on binlog file position of that server.

As an example, let's see this topology:

  Master A -> Source B -> Target C (C has vreplication stream from B)

Prior to this change, masterGTIDSet was returning the binlogfile:pos of A. But
in reality, the Target C wants the position of B.

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #6:

Cleanup per review

* Address PR review + some other cleanup per linter

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
rafael pushed a commit that referenced this pull request Oct 1, 2020
This is the 1st commit message:

VDiff ad-hoc version for slack

This is the commit message #2:

Removes extra log items

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #3:

Print actual position where it actually stop

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #4:

Fixes bug in filepos flavor

* Prior to this commit, flavorpos was using lexicographical comparison of the gtids.
  Thas was a bug in this context.

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #5:

Updates how master gtid position is obtained for file:pos flavor

When generating masterGTIDSet in file:pos most likely you will have a topology
like the following:

  Source A -> Target B (B has a vreplication stream from A)

From the target perspective, the source A is the master and you want to generate
a gtid that is based on binlog file position of that server.

As an example, let's see this topology:

  Master A -> Source B -> Target C (C has vreplication stream from B)

Prior to this change, masterGTIDSet was returning the binlogfile:pos of A. But
in reality, the Target C wants the position of B.

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #6:

Cleanup per review

* Address PR review + some other cleanup per linter

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

Fixes due to changes upstream

Fixes due to bad cherry-pick

Fixes due to refactors upstream

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

one more bad merge

Slowly building context around this code from december again

Refactor to use new name

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
rafael pushed a commit that referenced this pull request Oct 7, 2020
This is the 1st commit message:

VDiff ad-hoc version for slack

This is the commit message #2:

Removes extra log items

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #3:

Print actual position where it actually stop

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #4:

Fixes bug in filepos flavor

* Prior to this commit, flavorpos was using lexicographical comparison of the gtids.
  Thas was a bug in this context.

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #5:

Updates how master gtid position is obtained for file:pos flavor

When generating masterGTIDSet in file:pos most likely you will have a topology
like the following:

  Source A -> Target B (B has a vreplication stream from A)

From the target perspective, the source A is the master and you want to generate
a gtid that is based on binlog file position of that server.

As an example, let's see this topology:

  Master A -> Source B -> Target C (C has vreplication stream from B)

Prior to this change, masterGTIDSet was returning the binlogfile:pos of A. But
in reality, the Target C wants the position of B.

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

This is the commit message #6:

Cleanup per review

* Address PR review + some other cleanup per linter

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

Fixes due to changes upstream

Fixes due to bad cherry-pick

Fixes due to refactors upstream

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>

one more bad merge

Slowly building context around this code from december again

Refactor to use new name

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
rafael pushed a commit that referenced this pull request May 18, 2021
…ion/cancellation

This is a combination of 4 commits.
This is the commit message #2:

Check that routing rules are deleted in unit test

This is the commit message #3:

Fix typo

This is the commit message #4:

Refresh all tablets in a shard when updating blacklisted tables

Signed-off-by: Rohit Nayak <rohit@planetscale.com>

Signed-off-by: Andres Taylor <andres@planetscale.com>
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.

9 participants