api: Revert for showing State in StoreInfo #4485

CabinfeverB · 2021-12-21T08:09:40Z

What problem does this PR solve?

What is changed and how it works?

Release note

None.

ti-chi-bot · 2021-12-21T08:09:41Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

JmPotato
nolouch

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.

codecov · 2021-12-21T08:25:59Z

Codecov Report

Merging #4485 (7e7f277) into master (95293d5) will increase coverage by 0.06%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #4485      +/-   ##
==========================================
+ Coverage   74.93%   74.99%   +0.06%     
==========================================
  Files         264      264              
  Lines       27937    27913      -24     
==========================================
  Hits        20934    20934              
+ Misses       5141     5124      -17     
+ Partials     1862     1855       -7

Flag	Coverage Δ
unittests	`74.99% <100.00%> (+0.06%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
server/api/store.go	`65.24% <100.00%> (-2.28%)`	⬇️
server/api/trend.go	`66.19% <100.00%> (ø)`
tests/cluster.go	`80.40% <100.00%> (ø)`
tests/pdctl/helper.go	`100.00% <100.00%> (ø)`
server/api/unsafe_operation.go	`55.55% <0.00%> (-16.67%)`	⬇️
server/region_syncer/server.go	`81.41% <0.00%> (-5.13%)`	⬇️
pkg/etcdutil/etcdutil.go	`84.70% <0.00%> (-3.53%)`	⬇️
server/schedule/placement/rule_manager.go	`84.00% <0.00%> (-1.15%)`	⬇️
server/encryptionkm/key_manager.go	`72.90% <0.00%> (-0.80%)`	⬇️
server/core/storage.go	`69.31% <0.00%> (-0.76%)`	⬇️
... and 18 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 95293d5...7e7f277. Read the comment docs.

…unction onlu used by test" This reverts commit acc531f. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

This reverts commit 0f0f65a. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

This reverts commit b36673f. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

This reverts commit 8c28174. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

This reverts commit acc942e. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

CabinfeverB · 2021-12-21T09:13:38Z

/cc @rleungx

CabinfeverB · 2021-12-21T09:36:24Z

/run-integration-test

CabinfeverB · 2021-12-21T09:37:06Z

/run-all-tests

CabinfeverB · 2021-12-21T09:51:05Z

/run-integration-test

rleungx

The rest LGTM.

rleungx · 2021-12-21T10:14:46Z

tests/cluster.go

@@ -361,7 +361,7 @@ func (s *TestServer) GetStoreRegions(storeID uint64) []*core.RegionInfo {
 func (s *TestServer) BootstrapCluster() error {
 	bootstrapReq := &pdpb.BootstrapRequest{
 		Header: &pdpb.RequestHeader{ClusterId: s.GetClusterID()},
-		Store:  &metapb.Store{Id: 1, Address: "mock://1", LastHeartbeat: time.Now().UnixNano()},


rleungx · 2021-12-21T10:15:04Z

server/api/trend.go

@@ -130,8 +130,8 @@ func (h *trendHandler) getTrendStores() ([]trendStore, error) {
 	for _, store := range stores {
 		info := newStoreInfo(h.svr.GetScheduleConfig(), store)
 		s := trendStore{
-			ID:              info.Store.StoreID,


We can keep it.

nolouch

lgtm

JmPotato · 2021-12-22T06:33:53Z

/merge

ti-chi-bot · 2021-12-22T06:33:54Z

@JmPotato: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

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 ti-community-infra/tichi repository.

ti-chi-bot · 2021-12-22T06:33:55Z

This pull request has been accepted and is ready to merge.

Commit hash: afcfb9f

* Revert "fix tikv#3816: recovered pdctl/store_test && add comment to function onlu used by test" This reverts commit acc531f. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com> * Revert "fix tikv#3816: fix code format problem" This reverts commit 0f0f65a. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com> * Revert "fix tikv#3816: fix code format problem" This reverts commit b36673f. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com> * Revert "fix tikv#3816: fix code format problem" This reverts commit 8c28174. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com> * Revert "Fix tikv#3816 delete unnecessary field and fix unit test" This reverts commit acc942e. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com> * revert tikv#4334 Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com> * revert tikv#4334: empty commit for add signed-off-by Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com> Co-authored-by: JmPotato <ghzpotato@gmail.com> Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

ti-chi-bot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Dec 21, 2021

ti-chi-bot requested review from disksing and nolouch December 21, 2021 08:09

CabinfeverB added 7 commits December 21, 2021 17:03

Revert "fix tikv#3816: recovered pdctl/store_test && add comment to f…

dffe9dd

…unction onlu used by test" This reverts commit acc531f. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Revert "fix tikv#3816: fix code format problem"

02c390f

This reverts commit 0f0f65a. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Revert "fix tikv#3816: fix code format problem"

e514c7b

This reverts commit b36673f. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Revert "fix tikv#3816: fix code format problem"

2332677

This reverts commit 8c28174. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Revert "Fix tikv#3816 delete unnecessary field and fix unit test"

a4e636b

This reverts commit acc942e. Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

revert tikv#4334

2f621df

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

revert tikv#4334: empty commit for add signed-off-by

afcfb9f

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

CabinfeverB force-pushed the revert_state branch from 126a044 to afcfb9f Compare December 21, 2021 09:04

ti-chi-bot requested a review from rleungx December 21, 2021 09:13

rleungx reviewed Dec 21, 2021

View reviewed changes

rleungx requested a review from JmPotato December 22, 2021 04:08

nolouch approved these changes Dec 22, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 22, 2021

JmPotato approved these changes Dec 22, 2021

View reviewed changes

ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Dec 22, 2021

ti-chi-bot added status/can-merge Indicates a PR has been approved by a committer. release-note-none Denotes a PR that doesn't merit a release note. labels Dec 22, 2021

ti-chi-bot removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Dec 22, 2021

Merge branch 'master' into revert_state

7e7f277

srstack mentioned this pull request Dec 22, 2021

tiup cluster scale-in two TiKV, when the two TiKV become Tomestone status, tiup cluster restart, the two tikv come back to cluster again pingcap/tiup#1685

Closed

ti-chi-bot merged commit 39fb207 into tikv:master Dec 22, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

api: Revert for showing State in StoreInfo #4485

api: Revert for showing State in StoreInfo #4485

CabinfeverB commented Dec 21, 2021 •

edited by JmPotato

Loading

ti-chi-bot commented Dec 21, 2021 •

edited

Loading

codecov bot commented Dec 21, 2021 •

edited

Loading

CabinfeverB commented Dec 21, 2021

CabinfeverB commented Dec 21, 2021

CabinfeverB commented Dec 21, 2021

CabinfeverB commented Dec 21, 2021

rleungx left a comment

rleungx Dec 21, 2021

rleungx Dec 21, 2021

nolouch left a comment

JmPotato commented Dec 22, 2021

ti-chi-bot commented Dec 22, 2021

ti-chi-bot commented Dec 22, 2021

api: Revert for showing State in StoreInfo #4485

api: Revert for showing State in StoreInfo #4485

Conversation

CabinfeverB commented Dec 21, 2021 • edited by JmPotato Loading

What problem does this PR solve?

What is changed and how it works?

Release note

ti-chi-bot commented Dec 21, 2021 • edited Loading

codecov bot commented Dec 21, 2021 • edited Loading

Codecov Report

CabinfeverB commented Dec 21, 2021

CabinfeverB commented Dec 21, 2021

CabinfeverB commented Dec 21, 2021

CabinfeverB commented Dec 21, 2021

rleungx left a comment

Choose a reason for hiding this comment

rleungx Dec 21, 2021

Choose a reason for hiding this comment

rleungx Dec 21, 2021

Choose a reason for hiding this comment

nolouch left a comment

Choose a reason for hiding this comment

JmPotato commented Dec 22, 2021

ti-chi-bot commented Dec 22, 2021

ti-chi-bot commented Dec 22, 2021

CabinfeverB commented Dec 21, 2021 •

edited by JmPotato

Loading

ti-chi-bot commented Dec 21, 2021 •

edited

Loading

codecov bot commented Dec 21, 2021 •

edited

Loading