fix

Author: maochongxin

src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java

@@ -1373,26 +1373,68 @@ public TableEntry refreshTableLocationByTabletId(TableEntry tableEntry, String t
             if (tableEntry == null) {
                 throw new ObTableEntryRefreshException("Table entry is null, tableName=" + tableName);
             }
-            long lastRefreshTime = tableEntry.getPartitionEntry().getPartitionInfo(tabletId).getLastUpdateTime();
+
+            ObPartitionLocationInfo info = tableEntry.getPartitionEntry().getPartitionInfo(tabletId);
+            if (info == null) {
+                throw new ObTableEntryRefreshException("Partition info is null for tabletId=" + tabletId);
+            }
+            
+            long lastRefreshTime = info.getLastUpdateTime();
             long currentTime = System.currentTimeMillis();
             if (currentTime - lastRefreshTime < tableEntryRefreshIntervalCeiling) {
                 return tableEntry;
             }
-            tableEntry = loadTableEntryLocationWithPriority(serverRoster, tableEntryKey, tableEntry, tabletId,
-                    tableEntryAcquireConnectTimeout, tableEntryAcquireSocketTimeout,
-                    serverAddressPriorityTimeout, serverAddressCachingTimeout, sysUA);
+            
+            Lock lock = info.refreshLock;
+            boolean acquired = false;
+            try {
+                acquired = lock.tryLock(tableEntryRefreshLockTimeout, TimeUnit.MILLISECONDS);
+
+                if (!acquired) {
+                    String errMsg = String.format(
+                            "Try to lock table location refreshing timeout. DataSource: %s, TableName: %s, Timeout: %dms.",
+                            dataSourceName, tableName, tableEntryRefreshLockTimeout);
+                    RUNTIME.error(errMsg);
+                    throw new ObTableEntryRefreshException(errMsg);
+                }
 
-            tableEntry.prepareForWeakRead(serverRoster.getServerLdcLocation());
+                // Double-check
+                lastRefreshTime = info.getLastUpdateTime();
+                currentTime = System.currentTimeMillis();
+                if (currentTime - lastRefreshTime < tableEntryRefreshIntervalCeiling) {
+                    return tableEntry;
+                }
+                
+                tableEntry = loadTableEntryLocationWithPriority(
+                        serverRoster,
+                        tableEntryKey,
+                        tableEntry,
+                        tabletId,
+                        tableEntryAcquireConnectTimeout,
+                        tableEntryAcquireSocketTimeout,
+                        serverAddressPriorityTimeout,
+                        serverAddressCachingTimeout,
+                        sysUA
+                );
+                
+                tableEntry.prepareForWeakRead(serverRoster.getServerLdcLocation());
+
+            } finally {
+                if (acquired) {
+                    lock.unlock();
+                }
+            }
 
         } catch (ObTableNotExistException | ObTableServerCacheExpiredException e) {
             RUNTIME.error("RefreshTableEntry encountered an exception", e);
             throw e;
         } catch (Exception e) {
-            String errorMsg = String.format("Failed to get table entry. Key=%s, TabletId=%d, message=%s", tableEntryKey, tabletId, e.getMessage());
+            String errorMsg = String.format("Failed to get table entry. Key=%s, TabletId=%d, message=%s",
+                    tableEntryKey, tabletId, e.getMessage());
             RUNTIME.error(LCD.convert("01-00020"), tableEntryKey, tableEntry, e);
             throw new ObTableEntryRefreshException(errorMsg, e);
         }
-
+        
         tableLocations.put(tableName, tableEntry);
         tableEntryRefreshContinuousFailureCount.set(0);
 

src/main/java/com/alipay/oceanbase/rpc/location/model/partition/ObPartitionLocationInfo.java

@@ -19,6 +19,7 @@
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import static com.alipay.oceanbase.rpc.protocol.payload.Constants.OB_INVALID_ID;
@@ -31,7 +32,8 @@ public class ObPartitionLocationInfo {
     public AtomicBoolean          initialized         = new AtomicBoolean(false);
     public final CountDownLatch   initializationLatch = new CountDownLatch(1);
 
-
+    public ReentrantLock refreshLock = new ReentrantLock();
+    
     public ObPartitionLocation getPartitionLocation() {
         rwLock.readLock().lock();
         try {