@@ -448,7 +448,7 @@ public final class ProcedureMessages {
 
   public static final String
       FAILED_TO_REMOVE_DATA_NODE_BECAUSE_DATA_REPLICATION_FACTOR_IS_ONE =
-          "Cannot remove DataNode because data_replication_factor is 1 or at least one DataRegion has only one replica. Removing a DataNode may cause data loss. Increase data_replication_factor and ensure each DataRegion has more than one replica before removing DataNodes.";
+          "Cannot remove DataNode because data_replication_factor is 1 or at least one DataRegion has only one replica. Removing DataNodes is not supported with single replica.";
   public static final String FAILED_TO_ROLLBACK_ALTER_PIPE_DETAILS_METADATA_WILL_BE_SYNCHRONIZED =
       "Failed to rollback alter pipe {}, details: {}, metadata will be synchronized later.";
   public static final String FAILED_TO_ROLLBACK_COMMIT_SET_TEMPLATE_ON_PATH_DUE_TO =
 
@@ -448,7 +448,7 @@ public final class ProcedureMessages {
 
   public static final String
       FAILED_TO_REMOVE_DATA_NODE_BECAUSE_DATA_REPLICATION_FACTOR_IS_ONE =
-          "不能移除 DataNode，因为 data_replication_factor 为 1，或至少存在一个 DataRegion 只有一个副本。移除 DataNode 可能造成数据丢失。请先提高 data_replication_factor，并确保每个 DataRegion 都有多个副本，再移除 DataNode。";
+          "不能移除 DataNode，因为 data_replication_factor 为 1，或至少存在一个 DataRegion 只有一个副本。单副本不支持移除 DataNode。";
   public static final String FAILED_TO_ROLLBACK_ALTER_PIPE_DETAILS_METADATA_WILL_BE_SYNCHRONIZED =
       "Failed to rollback alter pipe {}, details: {}, metadata will be synchronized later.";
   public static final String FAILED_TO_ROLLBACK_COMMIT_SET_TEMPLATE_ON_PATH_DUE_TO =
 
@@ -108,6 +108,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -147,9 +148,6 @@ public class PartitionManager {
   public static final String CONSENSUS_WRITE_ERROR =
       "Failed in the write API executing the consensus layer due to: ";
 
-  private static final long REGION_GROUP_VISIBILITY_TIMEOUT_MS = 10_000L;
-  private static final long REGION_GROUP_VISIBILITY_CHECK_INTERVAL_MS = 20L;
-
   // Monitor for leadership change
   private final Object scheduleMonitor = new Object();
 
@@ -718,75 +716,12 @@ private TSStatus generateAndAllocateRegionGroups(
           getLoadManager().allocateRegionGroups(allotmentMap, consensusGroupType);
       LOGGER.info(ManagerMessages.CREATEREGIONGROUPS_STARTING_TO_CREATE_THE_FOLLOWING_REGIONGROUPS);
       createRegionGroupsPlan.planLog(LOGGER);
-      final TSStatus createStatus =
-          getProcedureManager().createRegionGroups(consensusGroupType, createRegionGroupsPlan);
-      if (createStatus.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
-        return createStatus;
-      }
-      return waitForRegionGroupsVisible(createRegionGroupsPlan, consensusGroupType);
+      return getProcedureManager().createRegionGroups(consensusGroupType, createRegionGroupsPlan);
     } else {
       return RpcUtils.SUCCESS_STATUS;
     }
   }
 
-  private TSStatus waitForRegionGroupsVisible(
-      final CreateRegionGroupsPlan createRegionGroupsPlan,
-      final TConsensusGroupType consensusGroupType) {
-    final Map<String, Set<TConsensusGroupId>> expectedRegionGroups = new HashMap<>();
-    createRegionGroupsPlan
-        .getRegionGroupMap()
-        .forEach(
-            (database, regionReplicaSets) -> {
-              final Set<TConsensusGroupId> regionGroupIds =
-                  regionReplicaSets.stream()
-                      .map(TRegionReplicaSet::getRegionId)
-                      .filter(regionGroupId -> consensusGroupType.equals(regionGroupId.getType()))
-                      .collect(Collectors.toSet());
-              if (!regionGroupIds.isEmpty()) {
-                expectedRegionGroups.put(database, regionGroupIds);
-              }
-            });
-
-    final long startTime = System.currentTimeMillis();
-    while (System.currentTimeMillis() - startTime <= REGION_GROUP_VISIBILITY_TIMEOUT_MS) {
-      if (areRegionGroupsVisible(expectedRegionGroups, consensusGroupType)) {
-        return RpcUtils.SUCCESS_STATUS;
-      }
-      try {
-        TimeUnit.MILLISECONDS.sleep(REGION_GROUP_VISIBILITY_CHECK_INTERVAL_MS);
-      } catch (final InterruptedException e) {
-        Thread.currentThread().interrupt();
-        return new TSStatus(TSStatusCode.CREATE_REGION_ERROR.getStatusCode())
-            .setMessage(
-                String.format(
-                    "Interrupted while waiting for created %s RegionGroups %s to become visible in PartitionInfo.",
-                    consensusGroupType, expectedRegionGroups));
-      }
-    }
-
-    final String message =
-        String.format(
-            "Created %s RegionGroups %s are not visible in PartitionInfo within %d ms.",
-            consensusGroupType, expectedRegionGroups, REGION_GROUP_VISIBILITY_TIMEOUT_MS);
-    LOGGER.warn(message);
-    return new TSStatus(TSStatusCode.CREATE_REGION_ERROR.getStatusCode()).setMessage(message);
-  }
-
-  private boolean areRegionGroupsVisible(
-      final Map<String, Set<TConsensusGroupId>> expectedRegionGroups,
-      final TConsensusGroupType consensusGroupType) {
-    for (final Map.Entry<String, Set<TConsensusGroupId>> entry : expectedRegionGroups.entrySet()) {
-      final Set<TConsensusGroupId> visibleRegionGroups =
-          partitionInfo.getRegionGroupSlotsCounter(entry.getKey(), consensusGroupType).stream()
-              .map(Pair::getRight)
-              .collect(Collectors.toSet());
-      if (!visibleRegionGroups.containsAll(entry.getValue())) {
-        return false;
-      }
-    }
-    return true;
-  }
-
   /**
    * Only leader use this interface. Checks whether the specified DataPartition has a successor and
    * returns if it does.
@@ -1059,6 +994,23 @@ public List<Pair<Long, TConsensusGroupId>> getSortedRegionGroupSlotsCounter(
     }
 
     if (result.isEmpty()) {
+      // Diagnostic for the intermittent "no available RegionGroup" CI failures: dump every
+      // RegionGroup visible in PartitionInfo for this Database together with its LoadCache status.
+      // This pinpoints whether PartitionInfo simply has no RegionGroup yet (newly created
+      // RegionGroup not exposed) or it has some but all of them are currently Disabled.
+      // Only logged on the failure path right before throwing, so it never floods the log.
+      final Map<TConsensusGroupId, RegionGroupStatus> visibleRegionGroupStatusMap =
+          new LinkedHashMap<>();
+      regionGroupSlotsCounter.forEach(
+          slotsCounter ->
+              visibleRegionGroupStatusMap.put(
+                  slotsCounter.getRight(),
+                  getLoadManager().getRegionGroupStatus(slotsCounter.getRight())));
+      LOGGER.warn(
+          "No available {} RegionGroup for Database: {}. RegionGroups visible in PartitionInfo and their LoadCache status: {}",
+          type,
+          database,
+          visibleRegionGroupStatusMap);
       throw new NoAvailableRegionGroupException(type, Collections.singletonList(database));
     }