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.

Sign up for GitHub

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

Jump to bottom

*: update pingcap/log to fix audit plugin build in 2.1 #14218

Closed
wants to merge 2 commits into from
Closed

*: update pingcap/log to fix audit plugin build in 2.1 #14218

wants to merge 2 commits into from

Conversation

lysu
Copy link
Contributor

@lysu lysu commented Dec 25, 2019 •
edited
Loading

What problem does this PR solve?

current release 2.1 branch load audit plugin will fail with

2019/12/25 14:14:44.149 terror.go:329: [fatal] plugin.Open("/home/robi/Code/go/src/github.com/pingcap/enterprise-plugin/audit/audit-1"): plugin was built with a different version of package github.com/pingcap/log
github.com/pingcap/errors.AddStack
	/home/robi/Code/go/pkg/mod/github.com/pingcap/[email protected]/errors.go:174
github.com/pingcap/errors.Trace
	/home/robi/Code/go/pkg/mod/github.com/pingcap/[email protected]/juju_adaptor.go:15
github.com/pingcap/tidb/plugin.loadManifestByGoPlugin
	/home/robi/Code/go/src/github.com/pingcap/tidb/plugin/plugin.go:342
github.com/pingcap/tidb/plugin.loadOne
	/home/robi/Code/go/src/github.com/pingcap/tidb/plugin/plugin.go:319
github.com/pingcap/tidb/plugin.Load
	/home/robi/Code/go/src/github.com/pingcap/tidb/plugin/plugin.go:179
github.com/pingcap/tidb/session.BootstrapSession
	/home/robi/Code/go/src/github.com/pingcap/tidb/session/session.go:1235
main.createStoreAndDomain
	/home/robi/Code/go/src/github.com/pingcap/tidb/tidb-server/main.go:196
main.main
	/home/robi/Code/go/src/github.com/pingcap/tidb/tidb-server/main.go:162
runtime.main
	/home/robi/runtime/go13/src/runtime/proc.go:203
runtime.goexit
	/home/robi/runtime/go13/src/runtime/asm_amd64.s:1357

What is changed and how it works?

audit plugin and release-3.0 have upgrade pingcap/log dependency, to make plugin can work with 2.1, we need upgrade log in 2.1 too

also cherry-pick conn_ip_example fix #10288 to 2.1

Check List

Tests

  • Manual test (add detailed scripts or steps below)
build and load plugin

Code changes

  • n/a

Side effects

  • n/a

Related changes

  • in 2.1

Release note

  • update pingcap/log to fix audit plugin build in 2.1

This change is Reviewable

@lysu lysu requested review from tiancaiamao and jackysp December 25, 2019 06:38
@lysu lysu added the type/bugfix This PR fixes a bug. label Dec 25, 2019
jackysp
jackysp reviewed Dec 25, 2019
View reviewed changes
Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp jackysp added status/LGT1 Indicates that a PR has LGTM 1. priority/release-blocker This issue blocks a release. Please solve it ASAP. labels Dec 25, 2019
@lysu
Copy link
Contributor Author

lysu commented Dec 25, 2019

/run-unit-test

@lysu
Copy link
Contributor Author

lysu commented Dec 25, 2019 •
edited
Loading

@tiancaiamao @imtbkcat PTAL

@lysu lysu requested a review from imtbkcat December 25, 2019 06:48
@imtbkcat
Copy link

/run-all-tests

imtbkcat
imtbkcat approved these changes Dec 25, 2019
View reviewed changes
Copy link

@imtbkcat imtbkcat left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp
Copy link
Member

jackysp commented Dec 25, 2019

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 25, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Dec 25, 2019

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Dec 25, 2019

@lysu merge failed.

@jackysp jackysp removed the priority/release-blocker This issue blocks a release. Please solve it ASAP. label Dec 25, 2019
@lysu
Copy link
Contributor Author

lysu commented Dec 25, 2019

/run-unit-test

@tiancaiamao
Copy link
Contributor

/run-unit-test
May the force be with you!

@zimulala zimulala removed the status/LGT1 Indicates that a PR has LGTM 1. label Dec 26, 2019
@zz-jason
Copy link
Member

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Dec 28, 2019

Your auto merge job has been accepted, waiting for 14258, 13878, 14052

@sre-bot
Copy link
Contributor

sre-bot commented Dec 28, 2019

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Dec 28, 2019

@lysu merge failed.

@lysu
Copy link
Contributor Author

lysu commented Dec 30, 2019

/run-unit-test

@lysu lysu closed this Jan 3, 2020
@lysu lysu deleted the fix21-log-version branch January 3, 2020 07:21
@bb7133
Copy link
Member

bb7133 commented Jan 16, 2020

Hi @lysu why this is closed?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackysp jackysp jackysp left review comments

@imtbkcat imtbkcat imtbkcat approved these changes

@tiancaiamao tiancaiamao tiancaiamao approved these changes

Assignees
No one assigned
Labels
component/build component/plugin status/can-merge Indicates a PR has been approved by a committer. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@lysu @imtbkcat @jackysp @sre-bot @tiancaiamao @zz-jason @bb7133 @zimulala @ngaut