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

pb: update pb parser to avoid drainer failure (#1093) #1123

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #1093

What problem does this PR solve?

close #1117.
When drainer syncing to pb meeting some unknown ddls, drainer will fail because of the unknown DDL.

What is changed and how it works?

Ignore this pb error when checking whether ddl is CreateDatabaseStmt

Check List

Tests

  • Unit test
  • Integration test

Code changes

  • Has exported function/method change
  • Has exported variable/fields change

Release note

  • No release note

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot
Copy link
Member Author

@ti-chi-bot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@@ -21,15 +21,22 @@ import (

"github.com/golang/protobuf/proto"
"github.com/pingcap/errors"
<<<<<<< HEAD
Copy link

Choose a reason for hiding this comment

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

expected 'STRING', found '<<' (and 10 more errors)

@@ -17,10 +17,16 @@ import (
"fmt"

"github.com/pingcap/check"
<<<<<<< HEAD
Copy link

Choose a reason for hiding this comment

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

expected 'STRING', found '<<' (and 9 more errors)

@@ -19,15 +19,22 @@ import (

"github.com/pingcap/errors"
"github.com/pingcap/log"
<<<<<<< HEAD
Copy link

Choose a reason for hiding this comment

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

expected 'STRING', found '<<' (and 10 more errors)

@@ -26,14 +26,28 @@ import (
"github.com/BurntSushi/toml"
"github.com/pingcap/errors"
"github.com/pingcap/log"
<<<<<<< HEAD
Copy link

Choose a reason for hiding this comment

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

expected 'STRING', found '<<' (and 10 more errors)

@@ -22,13 +22,18 @@ import (

. "github.com/pingcap/check"
"github.com/pingcap/log"
<<<<<<< HEAD
Copy link

Choose a reason for hiding this comment

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

expected 'STRING', found '<<' (and 10 more errors)

@ti-chi-bot ti-chi-bot closed this Sep 26, 2023
@ti-chi-bot
Copy link
Member Author

This pull request is closed because its related version has closed automatic cherry-picking.
If it's still needed, you can reopen it or just regenerate it using bot,
see:

https://prow.tidb.net/command-help#cherrypick
https://book.prow.tidb.net/#/plugins/cherrypicker

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants