Skip to content

Commit

Permalink
This is an automated cherry-pick of tikv#8486
Browse files Browse the repository at this point in the history
close tikv#8480

Signed-off-by: ti-chi-bot <[email protected]>
  • Loading branch information
rleungx authored and ti-chi-bot committed Aug 27, 2024
1 parent c5b31cc commit 5845e7c
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 2 deletions.
38 changes: 36 additions & 2 deletions server/api/label_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ import (
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/pingcap/kvproto/pkg/pdpb"
"github.com/stretchr/testify/suite"
<<<<<<< HEAD

Check failure on line 25 in server/api/label_test.go

View workflow job for this annotation

GitHub Actions / statics

expected 'STRING', found '<<'

Check failure on line 25 in server/api/label_test.go

View workflow job for this annotation

GitHub Actions / statics

expected 'STRING', found '<<'
tu "github.com/tikv/pd/pkg/testutil"
=======
"github.com/tikv/pd/pkg/core"
"github.com/tikv/pd/pkg/response"
tu "github.com/tikv/pd/pkg/utils/testutil"
>>>>>>> c8ad186c3 (server: skip the engine key when match store label (#8486))
"github.com/tikv/pd/server"
"github.com/tikv/pd/server/config"
)
Expand Down Expand Up @@ -274,19 +280,47 @@ func (suite *strictlyLabelsStoreTestSuite) TestStoreMatch() {
valid: false,
expectError: "key matching the label was not found",
},
{
store: &metapb.Store{
Id: 3,
Address: "tiflash1",
State: metapb.StoreState_Up,
Labels: []*metapb.StoreLabel{
{
Key: "zone",
Value: "us-west-1",
},
{
Key: "disk",
Value: "ssd",
},
{
Key: core.EngineKey,
Value: core.EngineTiFlash,
},
},
Version: "3.0.0",
},
valid: true,
expectError: "placement rules is disabled",
},
}

for _, testCase := range testCases {
resp, err := suite.grpcSvr.PutStore(context.Background(), &pdpb.PutStoreRequest{
Header: &pdpb.RequestHeader{ClusterId: suite.svr.ClusterID()},
Store: &metapb.Store{
Id: testCase.store.Id,
Address: fmt.Sprintf("tikv%d", testCase.store.Id),
Address: testCase.store.Address,
State: testCase.store.State,
Labels: testCase.store.Labels,
Version: testCase.store.Version,
},
})
if testCase.store.Address == "tiflash1" {
re.Contains(resp.GetHeader().GetError().String(), testCase.expectError)
continue
}
if testCase.valid {
suite.NoError(err)
suite.Nil(resp.GetHeader().GetError())
Expand All @@ -306,7 +340,7 @@ func (suite *strictlyLabelsStoreTestSuite) TestStoreMatch() {
Header: &pdpb.RequestHeader{ClusterId: suite.svr.ClusterID()},
Store: &metapb.Store{
Id: testCase.store.Id,
Address: fmt.Sprintf("tikv%d", testCase.store.Id),
Address: testCase.store.Address,
State: testCase.store.State,
Labels: testCase.store.Labels,
Version: testCase.store.Version,
Expand Down
3 changes: 3 additions & 0 deletions server/cluster/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -1199,6 +1199,9 @@ func (c *RaftCluster) checkStoreLabels(s *core.StoreInfo) error {
}
for _, label := range s.GetLabels() {
key := label.GetKey()
if key == core.EngineKey {
continue
}
if _, ok := keysSet[key]; !ok {
log.Warn("not found the key match with the store label",
zap.Stringer("store", s.GetMeta()),
Expand Down

0 comments on commit 5845e7c

Please sign in to comment.