fix refresh table entry invalid

oceanbase · Jun 13, 2024 · 491beeb · 491beeb
1 parent 9921873
commit 491beeb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/route/route_info.go b/route/route_info.go
@@ -440,13 +440,34 @@ func (i *ObRouteInfo) refreshTableLocations(addr *tcpAddr) error {
 	i.tableLocations.Range(func(key, value interface{}) bool {
 		tableName := key.(string)
 		entry := value.(*ObTableEntry)
-		for _, replica := range entry.tableLocation.replicaLocations {
-			if replica.addr.tcpAddr.Equal(addr) {
-				// trigger refresh table
-				isRefreshing := &atomic.Bool{}
-				isRefreshing.Store(false)
-				i.taskInfo.tables.AddIfAbsent(tableName, isRefreshing)
-				i.taskInfo.TriggerRefreshTable()
+		if !entry.IsPartitionTable() {
+			for _, replica := range entry.tableLocation.replicaLocations {
+				if replica.addr.tcpAddr.Equal(addr) {
+					// trigger refresh table
+					isRefreshing := &atomic.Bool{}
+					isRefreshing.Store(false)
+					i.taskInfo.tables.AddIfAbsent(tableName, isRefreshing)
+					i.taskInfo.TriggerRefreshTable()
+				}
+			}
+		} else {
+			for partId, partLocation := range entry.partLocationEntry.partLocations {
+				if partLocation != nil {
+					replica := partLocation.getReplica(ConsistencyStrong)
+					if replica != nil && replica.addr.tcpAddr.Equal(addr) {
+						// trigger refresh table
+						isRefreshing := &atomic.Bool{}
+						isRefreshing.Store(false)
+						i.taskInfo.tables.AddIfAbsent(tableName, isRefreshing)
+						i.taskInfo.TriggerRefreshTable()
+					} else if replica == nil {
+						log.Warn("Routine", nil, "partLocation leader replica is nil",
+							log.String("tableName", tableName), log.Uint64("partId", partId))
+					}
+				} else {
+					log.Warn("Routine", nil, "partLocation is nil",
+						log.String("tableName", tableName), log.Uint64("partId", partId))
+				}
 			}
 		}
 		return true

diff --git a/route/table_entry.go b/route/table_entry.go
@@ -36,7 +36,7 @@ type ObTableEntry struct {
 	refreshTime       time.Time            // last refresh time
 	tableEntryKey     *ObTableEntryKey     // clusterName/tenantName/databaseName/tableName
 	partitionInfo     *obPartitionInfo     // partition key meta info
-	tableLocation     *ObTableLocation     // location of table, all replica information of table
+	tableLocation     *ObTableLocation     // all replica location for non-partition table
 	partLocationEntry *ObPartLocationEntry // all partition location of table
 }