schedule: fix the attempt mechanism (#6825)

close #5201 Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Jul 21, 2023 · dac6dad · dac6dad
1 parent c9939b6
commit dac6dad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/pkg/schedule/checker/priority_inspector.go b/pkg/schedule/checker/priority_inspector.go
@@ -104,9 +104,11 @@ func (p *PriorityInspector) addOrRemoveRegion(priority int, regionID uint64) {
 			e := entry.Value.(*RegionPriorityEntry)
 			e.Attempt++
 			e.Last = time.Now()
+			p.queue.Put(priority, e)
+		} else {
+			entry := NewRegionEntry(regionID)
+			p.queue.Put(priority, entry)
 		}
-		entry := NewRegionEntry(regionID)
-		p.queue.Put(priority, entry)
 	} else {
 		p.queue.Remove(regionID)
 	}

diff --git a/pkg/schedule/checker/priority_inspector_test.go b/pkg/schedule/checker/priority_inspector_test.go
@@ -75,6 +75,13 @@ func checkPriorityRegionTest(re *require.Assertions, pc *PriorityInspector, tc *
 	pc.Inspect(region)
 	re.Equal(1, pc.queue.Len())
 
+	// case5: inspect region 3 again
+	region = tc.GetRegion(3)
+	pc.Inspect(region)
+	time.Sleep(opt.GetPatrolRegionInterval() * 10)
+	ids = pc.GetPriorityRegions()
+	re.Empty(ids)
+
 	// recover
 	tc.AddLeaderRegion(2, 2, 3)
 	pc.RemovePriorityRegion(uint64(3))