-
Notifications
You must be signed in to change notification settings - Fork 721
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
core:solve bug in hot_region_storage (#4121)
* cluster:add hot_region_storage Signed-off-by: qidi1 <1083369179@qq.com> * change cluster part Signed-off-by: qidi1 <1083369179@qq.com> * change isleader to bool Signed-off-by: qidi1 <1083369179@qq.com> * remove cluster code that no need Signed-off-by: qidi1 <1083369179@qq.com> * add wg Signed-off-by: qidi1 <1083369179@qq.com> * move hot_region_storage to core Signed-off-by: qidi1 <1083369179@qq.com> * cluster:merge from remote Signed-off-by: qidi1 <1083369179@qq.com> * cluster:change 1000 to time.Millisecond Signed-off-by: qidi1 <1083369179@qq.com> * cluster:change 12 to defalut,go out function Signed-off-by: qidi1 <1083369179@qq.com> * clsuter:format check Signed-off-by: qidi1 <1083369179@qq.com> * cluster:add mock for peer id Signed-off-by: qidi1 <1083369179@qq.com> * cluster:fix bug every region see as read,AsPeer include AsLeader,remove AsLeader Signed-off-by: qidi1 <1083369179@qq.com> * cluster:add test for hot region storage Signed-off-by: qidi1 <1083369179@qq.com> * cluster:add test in tests/server/core Signed-off-by: qidi1 <1083369179@qq.com> * cluster:remove some unuse code Signed-off-by: qidi1 <1083369179@qq.com> * core:change core.HotRegionType from string to enum Signed-off-by: qidi1 <1083369179@qq.com> * Update hot_region_storage_test.go Signed-off-by: nolouch <nolouch@gmail.com> * Update handler.go Signed-off-by: qidi1 <1083369179@qq.com> Signed-off-by: nolouch <nolouch@gmail.com> Co-authored-by: ShuNing <nolouch@gmail.com>
- Loading branch information
Showing
4 changed files
with
206 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| // Copyright 2021 TiKV Project Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package core_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
| "time" | ||
|
|
||
| . "github.com/pingcap/check" | ||
| "github.com/pingcap/kvproto/pkg/metapb" | ||
| "github.com/pingcap/kvproto/pkg/pdpb" | ||
| "github.com/tikv/pd/server" | ||
| "github.com/tikv/pd/server/config" | ||
| "github.com/tikv/pd/server/core" | ||
| "github.com/tikv/pd/server/statistics" | ||
| "github.com/tikv/pd/tests" | ||
| "github.com/tikv/pd/tests/pdctl" | ||
| ) | ||
|
|
||
| func Test(t *testing.T) { | ||
| TestingT(t) | ||
| } | ||
|
|
||
| var _ = Suite(&hotRegionHistorySuite{}) | ||
|
|
||
| type hotRegionHistorySuite struct{} | ||
|
|
||
| func (s *hotRegionHistorySuite) SetUpSuite(c *C) { | ||
| server.EnableZap = true | ||
| } | ||
|
|
||
| func (s *hotRegionHistorySuite) TestHotRegionStorage(c *C) { | ||
| statistics.Denoising = false | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
| cluster, err := tests.NewTestCluster(ctx, 1, | ||
| func(cfg *config.Config, serverName string) { | ||
| cfg.Schedule.HotRegionCacheHitsThreshold = 0 | ||
| cfg.Schedule.HotRegionsWriteInterval.Duration = 1000 * time.Millisecond | ||
| cfg.Schedule.HotRegionsResevervedDays = 1 | ||
| }, | ||
| ) | ||
| c.Assert(err, IsNil) | ||
| err = cluster.RunInitialServers() | ||
| c.Assert(err, IsNil) | ||
| cluster.WaitLeader() | ||
| stores := []*metapb.Store{ | ||
| { | ||
| Id: 1, | ||
| State: metapb.StoreState_Up, | ||
| LastHeartbeat: time.Now().UnixNano(), | ||
| }, | ||
| { | ||
| Id: 2, | ||
| State: metapb.StoreState_Up, | ||
| LastHeartbeat: time.Now().UnixNano(), | ||
| }, | ||
| } | ||
|
|
||
| leaderServer := cluster.GetServer(cluster.GetLeader()) | ||
| c.Assert(leaderServer.BootstrapCluster(), IsNil) | ||
| for _, store := range stores { | ||
| pdctl.MustPutStore(c, leaderServer.GetServer(), store) | ||
| } | ||
| defer cluster.Destroy() | ||
| startTime := time.Now().UnixNano() / int64(time.Millisecond) | ||
| pdctl.MustPutRegion(c, cluster, 1, 1, []byte("a"), []byte("b"), core.SetWrittenBytes(3000000000), core.SetReportInterval(statistics.WriteReportInterval)) | ||
| pdctl.MustPutRegion(c, cluster, 2, 2, []byte("c"), []byte("d"), core.SetWrittenBytes(6000000000), core.SetReportInterval(statistics.WriteReportInterval)) | ||
| pdctl.MustPutRegion(c, cluster, 3, 1, []byte("e"), []byte("f")) | ||
| pdctl.MustPutRegion(c, cluster, 4, 2, []byte("g"), []byte("h")) | ||
| storeStatss := []*pdpb.StoreStats{ | ||
| { | ||
| StoreId: 1, | ||
| Interval: &pdpb.TimeInterval{StartTimestamp: 0, EndTimestamp: statistics.ReadReportInterval}, | ||
| PeerStats: []*pdpb.PeerStat{ | ||
| { | ||
| RegionId: 3, | ||
| ReadBytes: 9000000000, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| StoreId: 2, | ||
| Interval: &pdpb.TimeInterval{StartTimestamp: 0, EndTimestamp: statistics.ReadReportInterval}, | ||
| PeerStats: []*pdpb.PeerStat{ | ||
| { | ||
| RegionId: 4, | ||
| ReadBytes: 9000000000, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| for _, storeStats := range storeStatss { | ||
| leaderServer.GetRaftCluster().HandleStoreHeartbeat(storeStats) | ||
| } | ||
| // wait hot scheduler starts | ||
| time.Sleep(5000 * time.Millisecond) | ||
| endTime := time.Now().UnixNano() / int64(time.Millisecond) | ||
| storage := leaderServer.GetServer().GetHistoryHotRegionStorage() | ||
| iter := storage.NewIterator([]string{core.WriteType.String()}, startTime, endTime) | ||
| next, err := iter.Next() | ||
| c.Assert(next, NotNil) | ||
| c.Assert(err, IsNil) | ||
| c.Assert(next.RegionID, Equals, uint64(1)) | ||
| c.Assert(next.StoreID, Equals, uint64(1)) | ||
| c.Assert(next.HotRegionType, Equals, core.WriteType.String()) | ||
| next, err = iter.Next() | ||
| c.Assert(next, NotNil) | ||
| c.Assert(err, IsNil) | ||
| c.Assert(next.RegionID, Equals, uint64(2)) | ||
| c.Assert(next.StoreID, Equals, uint64(2)) | ||
| c.Assert(next.HotRegionType, Equals, core.WriteType.String()) | ||
| next, err = iter.Next() | ||
| c.Assert(next, IsNil) | ||
| c.Assert(err, IsNil) | ||
| iter = storage.NewIterator([]string{core.ReadType.String()}, startTime, endTime) | ||
| next, err = iter.Next() | ||
| c.Assert(next, NotNil) | ||
| c.Assert(err, IsNil) | ||
| c.Assert(next.RegionID, Equals, uint64(3)) | ||
| c.Assert(next.StoreID, Equals, uint64(1)) | ||
| c.Assert(next.HotRegionType, Equals, core.ReadType.String()) | ||
| next, err = iter.Next() | ||
| c.Assert(next, NotNil) | ||
| c.Assert(err, IsNil) | ||
| c.Assert(next.RegionID, Equals, uint64(4)) | ||
| c.Assert(next.StoreID, Equals, uint64(2)) | ||
| c.Assert(next.HotRegionType, Equals, core.ReadType.String()) | ||
| next, err = iter.Next() | ||
| c.Assert(next, IsNil) | ||
| c.Assert(err, IsNil) | ||
| } |