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

[cherry-pick-2.1] Fix event listener issue #4132

Merged
merged 4 commits into from Feb 13, 2019

Conversation

Projects
None yet
6 participants
@DorianZheng
Copy link
Member

DorianZheng commented Jan 27, 2019

What have you changed? (mandatory)

Check status of CompactionJobInfo at first.

What are the type of the changes? (mandatory)

  • Bug fix

How has this PR been tested? (mandatory)

CI

Does this PR affect documentation (docs) update? (mandatory)

No

Does this PR affect tidb-ansible update? (mandatory)

No

Refer to a related PR or issue link (optional)

Benchmark result if necessary (optional)

Add a few positive/negative examples (optional)

DorianZheng added some commits Jan 26, 2019

Fix event listener issue (#4126)
* Check status of CompactionJobInfo

Signed-off-by: DorianZheng <xingzhengde72@gmail.com>

(cherry picked from commit 22957b7)
Signed-off-by: DorianZheng <xingzhengde72@gmail.com>
update rocksdb
Signed-off-by: DorianZheng <xingzhengde72@gmail.com>
@siddontang

This comment has been minimized.

Copy link
Contributor

siddontang commented Jan 28, 2019

CI failed

seem now master and release use different rust version.

/cc @brson @huachaohuang @zhangjinpeng1987

@huachaohuang

This comment has been minimized.

Copy link
Contributor

huachaohuang commented Jan 28, 2019

@DorianZheng We should add a release-2.1 branch without Titan related code in pingcap/rust-rocksdb.

@brson

This comment has been minimized.

Copy link
Contributor

brson commented Jan 29, 2019

@siddontang yes they are on different versions now. What do you think we should do about it? How long is it between now and the next release?

@siddontang

This comment has been minimized.

Copy link
Contributor

siddontang commented Feb 2, 2019

@overvenus

This comment has been minimized.

Copy link
Member

overvenus commented Feb 13, 2019

/run-all-tests

@overvenus

This comment was marked as resolved.

Copy link
Member

overvenus commented Feb 13, 2019

In order to compile tikv-ctl, we need to cherry pick #4068, PTAL @huachaohuang , especially the rocksdb commit hash, thanks!

create release-2.1 for rust-rocksdb
Signed-off-by: DorianZheng <xingzhengde72@gmail.com>

@DorianZheng DorianZheng force-pushed the DorianZheng:cherry-pick-release-2.1 branch from 173b926 to 2ff9478 Feb 13, 2019

@DorianZheng

This comment has been minimized.

Copy link
Member Author

DorianZheng commented Feb 13, 2019

@overvenus I will create a release-2.1 branch for rust-rocksdb, so never mind the previous CI failed

@DorianZheng

This comment has been minimized.

Copy link
Member Author

DorianZheng commented Feb 13, 2019

@overvenus
Copy link
Member

overvenus left a comment

LGTM

@overvenus

This comment has been minimized.

Copy link
Member

overvenus commented Feb 13, 2019

/run-integration-tests tidb=release-2.1 pd=release-2.1 tidb-test=release-2.1

update rust-rocksdb
Signed-off-by: DorianZheng <xingzhengde72@gmail.com>
@huachaohuang
Copy link
Contributor

huachaohuang left a comment

LGTM

Show resolved Hide resolved src/util/jemalloc.rs

@overvenus overvenus merged commit 831684a into tikv:release-2.1 Feb 13, 2019

2 checks passed

DCO All commits are signed off!
Details
idc-jenkins-ci/test Jenkins job succeeded.
Details

@DorianZheng DorianZheng deleted the DorianZheng:cherry-pick-release-2.1 branch Feb 13, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.