Skip to content

Commit

Permalink
resolve confilcts
Browse files Browse the repository at this point in the history 
Signed-off-by: Ryan Leung <rleungx@gmail.com>
  • Loading branch information
@rleungx
rleungx committed Nov 22, 2022
1 parent 3bae6b0 commit c340f45
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 205 deletions.
12 changes: 0 additions & 12 deletions server/cluster/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -881,18 +881,6 @@ func (c *RaftCluster) processRegionHeartbeat(region *core.RegionInfo) error {
return nil
}

<<<<<<< HEAD
func (c *RaftCluster) updateStoreStatusLocked(id uint64) {
leaderCount := c.core.GetStoreLeaderCount(id)
regionCount := c.core.GetStoreRegionCount(id)
pendingPeerCount := c.core.GetStorePendingPeerCount(id)
leaderRegionSize := c.core.GetStoreLeaderRegionSize(id)
regionSize := c.core.GetStoreRegionSize(id)
c.core.UpdateStoreStatus(id, leaderCount, regionCount, pendingPeerCount, leaderRegionSize, regionSize)
}

=======
>>>>>>> 2b519327b (*: use independent lock (#5587))
func (c *RaftCluster) putMetaLocked(meta *metapb.Cluster) error {
if c.storage != nil {
if err := c.storage.SaveMeta(meta); err != nil {
Expand Down
152 changes: 17 additions & 135 deletions server/cluster/cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ func (s *testClusterInfoSuite) TestStoreHeartbeat(c *C) {
for _, region := range regions {
c.Assert(cluster.putRegion(region), IsNil)
}
<<<<<<< HEAD
c.Assert(cluster.core.Regions.GetRegionCount(), Equals, int(n))
=======
re.Equal(int(n), cluster.core.Regions.RegionsInfo.GetRegionCount())
>>>>>>> 2b519327b (*: use independent lock (#5587))

for i, store := range stores {
storeStats := &pdpb.StoreStats{
Expand Down Expand Up @@ -646,78 +642,43 @@ func (s *testClusterInfoSuite) TestRegionHeartbeat(c *C) {

for i, region := range regions {
// region does not exist.
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(c, cluster.storage, regions[:i+1])

// region is the same, not updated.
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(c, cluster.storage, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(re, cluster.storage, regions[:i+1])

// region is the same, not updated.
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(re, cluster.storage, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))
origin := region
// region is updated.
region = origin.Clone(core.WithIncVersion())
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(c, cluster.storage, regions[:i+1])

// region is stale (Version).
stale := origin.Clone(core.WithIncConfVer())
c.Assert(cluster.processRegionHeartbeat(stale), NotNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(c, cluster.storage, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(re, cluster.storage, regions[:i+1])

// region is stale (Version).
stale := origin.Clone(core.WithIncConfVer())
re.Error(cluster.processRegionHeartbeat(stale))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(re, cluster.storage, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))

// region is updated.
region = origin.Clone(
core.WithIncVersion(),
core.WithIncConfVer(),
)
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(c, cluster.storage, regions[:i+1])

// region is stale (ConfVer).
stale = origin.Clone(core.WithIncConfVer())
c.Assert(cluster.processRegionHeartbeat(stale), NotNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(c, cluster.storage, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(re, cluster.storage, regions[:i+1])

// region is stale (ConfVer).
stale = origin.Clone(core.WithIncConfVer())
re.Error(cluster.processRegionHeartbeat(stale))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(re, cluster.storage, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))

// Add a down peer.
region = region.Clone(core.WithDownPeers([]*pdpb.PeerStats{
Expand All @@ -727,136 +688,70 @@ func (s *testClusterInfoSuite) TestRegionHeartbeat(c *C) {
},
}))
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])

// Add a pending peer.
region = region.Clone(core.WithPendingPeers([]*metapb.Peer{region.GetPeers()[rand.Intn(len(region.GetPeers()))]}))
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])

// Clear down peers.
region = region.Clone(core.WithDownPeers(nil))
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])

// Clear pending peers.
region = region.Clone(core.WithPendingPeers(nil))
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])

// Remove peers.
origin = region
region = origin.Clone(core.SetPeers(region.GetPeers()[:1]))
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(c, cluster.storage, regions[:i+1])
// Add peers.
region = origin
regions[i] = region
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(c, cluster.storage, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(re, cluster.storage, regions[:i+1])
// Add peers.
region = origin
regions[i] = region
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
checkRegionsKV(re, cluster.storage, regions[:i+1])

// Change one peer to witness
region = region.Clone(
core.WithWitnesses([]*metapb.Peer{region.GetPeers()[rand.Intn(len(region.GetPeers()))]}),
core.WithIncConfVer(),
)
regions[i] = region
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))

// Change leader.
region = region.Clone(core.WithLeader(region.GetPeers()[1]))
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])

// Change ApproximateSize.
region = region.Clone(core.SetApproximateSize(144))
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])

// Change ApproximateKeys.
region = region.Clone(core.SetApproximateKeys(144000))
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])

// Change bytes written.
region = region.Clone(core.SetWrittenBytes(24000))
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])

// Change bytes read.
region = region.Clone(core.SetReadBytes(1080000))
regions[i] = region
<<<<<<< HEAD
c.Assert(cluster.processRegionHeartbeat(region), IsNil)
checkRegions(c, cluster.core.Regions, regions[:i+1])
=======
re.NoError(cluster.processRegionHeartbeat(region))
checkRegions(re, cluster.core.Regions.RegionsInfo, regions[:i+1])
>>>>>>> 2b519327b (*: use independent lock (#5587))
checkRegions(c, cluster.core.Regions.RegionsInfo, regions[:i+1])
}

regionCounts := make(map[uint64]int)
Expand Down Expand Up @@ -887,17 +782,10 @@ func (s *testClusterInfoSuite) TestRegionHeartbeat(c *C) {
}

for _, store := range cluster.core.Stores.GetStores() {
<<<<<<< HEAD
c.Assert(store.GetLeaderCount(), Equals, cluster.core.Regions.GetStoreLeaderCount(store.GetID()))
c.Assert(store.GetRegionCount(), Equals, cluster.core.Regions.GetStoreRegionCount(store.GetID()))
c.Assert(store.GetLeaderSize(), Equals, cluster.core.Regions.GetStoreLeaderRegionSize(store.GetID()))
c.Assert(store.GetRegionSize(), Equals, cluster.core.Regions.GetStoreRegionSize(store.GetID()))
=======
re.Equal(cluster.core.Regions.RegionsInfo.GetStoreLeaderCount(store.GetID()), store.GetLeaderCount())
re.Equal(cluster.core.Regions.RegionsInfo.GetStoreRegionCount(store.GetID()), store.GetRegionCount())
re.Equal(cluster.core.Regions.RegionsInfo.GetStoreLeaderRegionSize(store.GetID()), store.GetLeaderSize())
re.Equal(cluster.core.Regions.RegionsInfo.GetStoreRegionSize(store.GetID()), store.GetRegionSize())
>>>>>>> 2b519327b (*: use independent lock (#5587))
}

// Test with storage.
Expand Down Expand Up @@ -1648,15 +1536,9 @@ func (s *testRegionsInfoSuite) Test(c *C) {
n, np := uint64(10), uint64(3)
regions := newTestRegions(n, n, np)
_, opts, err := newTestScheduleConfig()
<<<<<<< HEAD
c.Assert(err, IsNil)
tc := newTestRaftCluster(s.ctx, mockid.NewIDAllocator(), opts, storage.NewStorageWithMemoryBackend(), core.NewBasicCluster())
cache := tc.core.Regions
=======
re.NoError(err)
tc := newTestRaftCluster(ctx, mockid.NewIDAllocator(), opts, storage.NewStorageWithMemoryBackend(), core.NewBasicCluster())
cache := tc.core.Regions.RegionsInfo
>>>>>>> 2b519327b (*: use independent lock (#5587))

for i := uint64(0); i < n; i++ {
region := regions[i]
Expand Down
Loading

0 comments on commit c340f45

Please sign in to comment.