resolve conflict

Signed-off-by: 童剑 <[email protected]>
tikv · Jan 26, 2025 · 0ec8726 · 0ec8726
1 parent 26f2704
commit 0ec8726
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/server/core/region.go b/server/core/region.go
@@ -887,16 +887,12 @@ func (r *RegionsInfo) setRegionLocked(region *RegionInfo) (*RegionInfo, []*Regio
 }
 
 // UpdateSubTree updates the subtree.
-<<<<<<< HEAD:server/core/region.go
 func (r *RegionsInfo) UpdateSubTree(region, origin *RegionInfo, toRemove []*RegionInfo, rangeChanged bool) {
-=======
-func (r *RegionsInfo) UpdateSubTree(region, origin *RegionInfo, overlaps []*RegionInfo, rangeChanged bool) {
 	failpoint.Inject("UpdateSubTree", func() {
 		if origin == nil {
 			time.Sleep(time.Second)
 		}
 	})
->>>>>>> 54219d649 (region: fix the potential panic .  (#7143)):pkg/core/region.go
 	r.st.Lock()
 	defer r.st.Unlock()
 	if origin != nil {

diff --git a/server/core/region_test.go b/server/core/region_test.go
@@ -456,7 +456,7 @@ func TestSetRegionConcurrence(t *testing.T) {
 	re := require.New(t)
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/core/UpdateSubTree", `return()`))
 	regions := NewRegionsInfo()
-	region := NewTestRegionInfo(1, 1, []byte("a"), []byte("b"))
+	region := NewTestRegionInfo([]byte("a"), []byte("b"))
 	go func() {
 		regions.AtomicCheckAndPutRegion(region)
 	}()