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

schedule: add IsFeatureSupported in Cluster Interface #2735

Merged
merged 12 commits into from
Aug 13, 2020
Merged

schedule: add IsFeatureSupported in Cluster Interface #2735

merged 12 commits into from
Aug 13, 2020

Conversation

HunDunDM
Copy link
Member

@HunDunDM HunDunDM commented Aug 7, 2020

Signed-off-by: Zheng Xiangsheng hundundm@gmail.com

What problem does this PR solve?

  • schedule: add IsFeatureSupported in Cluster Interface
  • add JointConsensus Feature type

What is changed and how it works?

  • mv version.go to versioninfo package

Check List

Tests

  • Unit test

Release note

@HunDunDM
mv version.go to versioninfo package
60a7fd0 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM HunDunDM self-assigned this Aug 7, 2020
@HunDunDM HunDunDM added component/cluster Cluster logic. component/schedule Scheduling logic. labels Aug 7, 2020
@HunDunDM
add IsFeatureSupported in Cluster Interface
6959d31 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
disksing
disksing reviewed Aug 7, 2020
View reviewed changes
server/cluster/cluster_worker.go Outdated Show resolved Hide resolved
server/grpc_service.go Outdated Show resolved Hide resolved
server/server.go Outdated Show resolved Hide resolved
server/util.go Outdated Show resolved Hide resolved
@disksing
Copy link
Contributor

disksing commented Aug 7, 2020

I think IsFeatureSupported and IsCompatible should merge into one function.
Consider this case: A feature is introduced by 5.1.1, after all tikv upgrade to 5.1.1, the feature is enabled. Then another 5.1.0 tikv starts to join the cluster. Since PD use IsCompatible to check, the TiKV will join successfully.

@HunDunDM
add IsFeatureSupported in Cluster Interface
dd4cc74 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM
reformat import
b670122 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM
reformat import
dc3795b 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM
refine IsFeatureSupported
c6c965a 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM
fix nil pointer
8d3deae 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
disksing
disksing reviewed Aug 10, 2020
View reviewed changes
server/cluster/cluster.go Outdated Show resolved Hide resolved
@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 10, 2020
@HunDunDM
add comment
360e53b 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
rleungx
rleungx reviewed Aug 10, 2020
View reviewed changes
server/cluster/cluster.go Outdated Show resolved Hide resolved
@HunDunDM
remove global var
067620c 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM
rename
177a81f 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM
Merge branch 'master' into is-feature-supported
c723f94 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>

# Conflicts:
#	pkg/mock/mockcluster/mockcluster.go
#	server/schedule/opt/opts.go
@HunDunDM
Copy link
Member Author

/run-all-tests

rleungx
rleungx approved these changes Aug 13, 2020
View reviewed changes
Copy link
Member

@rleungx rleungx left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Aug 13, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Aug 13, 2020
@disksing
Copy link
Contributor

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 13, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 9c3180a into tikv:master Aug 13, 2020
@HunDunDM HunDunDM deleted the is-feature-supported branch August 14, 2020 03:17
disksing pushed a commit to oh-my-tidb/pd that referenced this pull request Aug 19, 2020
@HunDunDM @disksing
schedule: add IsFeatureSupported in Cluster Interface (tikv#2735)
e78cd49 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
ZenoTan pushed a commit to ZenoTan/pd that referenced this pull request Aug 24, 2020
@HunDunDM
schedule: add IsFeatureSupported in Cluster Interface (tikv#2735)
fcc7e25 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
jyz0309 pushed a commit to jyz0309/pd that referenced this pull request Aug 24, 2020
@HunDunDM @jyz0309
schedule: add IsFeatureSupported in Cluster Interface (tikv#2735)
1baed6f 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
jyz0309 pushed a commit to jyz0309/pd that referenced this pull request Aug 24, 2020
@HunDunDM @jyz0309
schedule: add IsFeatureSupported in Cluster Interface (tikv#2735)
9dc2425 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM HunDunDM mentioned this pull request Sep 2, 2020
Closed
37 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ti-srebot ti-srebot ti-srebot approved these changes

@rleungx rleungx rleungx approved these changes

@disksing disksing disksing approved these changes

@nolouch nolouch Awaiting requested review from nolouch

Assignees

@HunDunDM HunDunDM

Labels
component/cluster Cluster logic. component/schedule Scheduling logic. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@HunDunDM @disksing @ti-srebot @rleungx