fast reload region on no-region-found error (tikv#1891) (tikv#1896)

ClamChowderTiDB · ClamChowderTiDB · commit 3e27d5239794 · 2026-03-27T14:45:05.000-05:00
X-Original-Commit: a093bf03c142c8d3dbdb6ec84143f43f0a339a88
diff --git a/internal/locate/region_cache.go b/internal/locate/region_cache.go
@@ -1828,12 +1828,16 @@ func (c *RegionCache) BatchLoadRegionsFromKey(bo *retry.Backoffer, startKey []by
 	return regions[len(regions)-1].EndKey(), nil
 }
 
+// AsyncInvalidateCachedRegion marks a cached region for reload on next access
+// without invalidating it, so in-flight retries can still proceed.
+// It sets needDelayedReloadReady directly, skipping the GC promotion from
+// needDelayedReloadPending for faster reload.
 func (c *RegionCache) AsyncInvalidateCachedRegion(id RegionVerID) {
 	cachedRegion := c.GetCachedRegionWithRLock(id)
 	if cachedRegion == nil {
 		return
 	}
-	cachedRegion.setSyncFlags(needDelayedReloadPending)
+	cachedRegion.setSyncFlags(needDelayedReloadReady)
 }
 
 // InvalidateCachedRegion removes a cached Region.
diff --git a/internal/locate/region_request_state_test.go b/internal/locate/region_request_state_test.go
@@ -528,7 +528,7 @@ func testStaleRead(s *testRegionCacheStaleReadSuite, r *RegionCacheTestCase, zon
 			return
 		}
 
-		s.Equal(*asyncReload, region.checkSyncFlags(needDelayedReloadPending))
+		s.Equal(*asyncReload, region.checkSyncFlags(needDelayedReloadPending|needDelayedReloadReady))
 	}()
 
 	bo := retry.NewBackoffer(ctx, -1)

Original file line number	Diff line number	Diff line change
`@@ -1828,12 +1828,16 @@ func (c RegionCache) BatchLoadRegionsFromKey(bo retry.Backoffer, startKey []by`
`1828`	`1828`	`return regions[len(regions)-1].EndKey(), nil`
`1829`	`1829`	`}`
`1830`	`1830`
	`1831`	`+// AsyncInvalidateCachedRegion marks a cached region for reload on next access`
	`1832`	`+// without invalidating it, so in-flight retries can still proceed.`
	`1833`	`+// It sets needDelayedReloadReady directly, skipping the GC promotion from`
	`1834`	`+// needDelayedReloadPending for faster reload.`
`1831`	`1835`	`func (c *RegionCache) AsyncInvalidateCachedRegion(id RegionVerID) {`
`1832`	`1836`	`cachedRegion := c.GetCachedRegionWithRLock(id)`
`1833`	`1837`	`if cachedRegion == nil {`
`1834`	`1838`	`return`
`1835`	`1839`	`}`
`1836`		`- cachedRegion.setSyncFlags(needDelayedReloadPending)`
	`1840`	`+ cachedRegion.setSyncFlags(needDelayedReloadReady)`
`1837`	`1841`	`}`
`1838`	`1842`
`1839`	`1843`	`// InvalidateCachedRegion removes a cached Region.`
Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ func testStaleRead(s testRegionCacheStaleReadSuite, r RegionCacheTestCase, zon`
`528`	`528`	`return`
`529`	`529`	`}`
`530`	`530`
`531`		`- s.Equal(*asyncReload, region.checkSyncFlags(needDelayedReloadPending))`
	`531`	`+ s.Equal(*asyncReload, region.checkSyncFlags(needDelayedReloadPending\|needDelayedReloadReady))`
`532`	`532`	`}()`
`533`	`533`
`534`	`534`	`bo := retry.NewBackoffer(ctx, -1)`