diff --git a/src/sql/engine/basic/ob_chunk_datum_store.cpp b/src/sql/engine/basic/ob_chunk_datum_store.cpp
index b5594d6278..17287ab7eb 100644
--- a/src/sql/engine/basic/ob_chunk_datum_store.cpp
+++ b/src/sql/engine/basic/ob_chunk_datum_store.cpp
@@ -576,6 +576,7 @@ bool ObChunkDatumStore::shrink_block(int64_t size)
             K(item->get_buffer()->mem_size()),
             K(size));
       }
+      dumped_row_cnt_ += item->rows();
       freed_size += item->get_buffer()->mem_size();
       LOG_DEBUG("RowStore shrink dump and free", K(size), K(freed_size), K(item->get_buffer()->mem_size()), K(item));
       free_block(item);
diff --git a/src/sql/engine/basic/ob_chunk_row_store.cpp b/src/sql/engine/basic/ob_chunk_row_store.cpp
index c6a7400640..91eca40b73 100644
--- a/src/sql/engine/basic/ob_chunk_row_store.cpp
+++ b/src/sql/engine/basic/ob_chunk_row_store.cpp
@@ -475,6 +475,7 @@ bool ObChunkRowStore::shrink_block(int64_t size)
             K(item->get_buffer()->mem_size()),
             K(size));
       }
+      dumped_row_cnt_ += item->rows();
       freed_size += item->get_buffer()->mem_size();
       LOG_DEBUG("RowStore shrink dump and free", K(size), K(freed_size), K(item->get_buffer()->mem_size()), K(item));
       free_block(item);
diff --git a/src/storage/ob_build_index_scheduler.cpp b/src/storage/ob_build_index_scheduler.cpp
index 413490d35a..88539f496b 100644
--- a/src/storage/ob_build_index_scheduler.cpp
+++ b/src/storage/ob_build_index_scheduler.cpp
@@ -696,7 +696,8 @@ int ObBuildIndexScheduleTask::check_trans_end(bool& is_trans_end, int64_t& snaps
     STORAGE_LOG(INFO, "wait trans already end", K(index_id_));
   } else if (OB_FAIL(ObPartitionService::get_instance().check_schema_version_elapsed(
                  pkey_, schema_version_, index_id_, status.snapshot_version_))) {
-    if (OB_EAGAIN != ret) {
+    if (OB_EAGAIN != ret && OB_ENTRY_NOT_EXIST != ret && OB_PG_PARTITION_NOT_EXIST != ret &&
+        OB_PARTITION_NOT_EXIST != ret) {
       STORAGE_LOG(WARN, "fail to check schema version eclapsed", K(ret), K(pkey_), K(index_id_));
     } else {
       ret = OB_SUCCESS;
@@ -757,7 +758,7 @@ int ObBuildIndexScheduleTask::check_rs_snapshot_elapsed(const int64_t snapshot_v
       STORAGE_LOG(WARN, "fail to wait gts elapse", K(ret), K(pkey_), K(index_id_));
     }
   } else if (OB_FAIL(ObPartitionService::get_instance().check_ctx_create_timestamp_elapsed(pkey_, snapshot_version))) {
-    if (OB_EAGAIN == ret) {
+    if (OB_EAGAIN == ret || OB_PG_PARTITION_NOT_EXIST == ret || OB_PARTITION_NOT_EXIST == ret || OB_ENTRY_NOT_EXIST) {
       ret = OB_SUCCESS;
     } else {
       STORAGE_LOG(WARN, "fail to check ctx create timestmap elapsed", K(ret), K(pkey_), K(index_id_));
@@ -823,6 +824,9 @@ int ObBuildIndexScheduleTask::copy_build_index_data(const bool is_leader)
     if (OB_ENTRY_NOT_EXIST == ret) {
       ret = OB_SUCCESS;
       need_copy = true;
+    } else if (OB_PG_PARTITION_NOT_EXIST == ret || OB_PARTITION_NOT_EXIST == ret || OB_ENTRY_NOT_EXIST == ret) {
+      // partition is no longer on this server
+      ret = OB_SUCCESS;
     } else {
       STORAGE_LOG(WARN, "fail to check replica has major sstable", K(ret), K(pkey_), K(index_id_));
     }
@@ -1049,7 +1053,7 @@ int ObBuildIndexScheduleTask::get_candidate_source_replica(const bool need_refre
     // first check self
     if (OB_SUCC(ret) && !candidate_replica_.is_valid()) {
       if (OB_FAIL(ObPartitionService::get_instance().check_single_replica_major_sstable_exist(pkey_, index_id_))) {
-        if (OB_ENTRY_NOT_EXIST != ret) {
+        if (OB_ENTRY_NOT_EXIST != ret && OB_PG_PARTITION_NOT_EXIST != ret && OB_PARTITION_NOT_EXIST != ret) {
           STORAGE_LOG(WARN, "fail to check single replica major sstable exist", K(ret));
         } else {
           ret = OB_SUCCESS;
@@ -1100,7 +1104,11 @@ int ObBuildIndexScheduleTask::check_need_choose_replica(bool& need)
       STORAGE_LOG(WARN, "fail to get current build index server", K(ret), K(pkey_), K(index_id_));
     }
   } else if (OB_FAIL(ObPartitionService::get_instance().get_leader_curr_member_list(pkey_, member_list))) {
-    STORAGE_LOG(WARN, "fail to get leader current member list", K(ret), K(pkey_), K(index_id_));
+    if (OB_PG_PARTITION_NOT_EXIST == ret || OB_PARTITION_NOT_EXIST == ret || OB_ENTRY_NOT_EXIST == ret) {
+      ret = OB_SUCCESS;
+    } else {
+      STORAGE_LOG(WARN, "fail to get leader current member list", K(ret), K(pkey_), K(index_id_));
+    }
   } else if (!member_list.contains(build_index_server)) {
     need = true;
   }
@@ -1234,7 +1242,7 @@ int ObBuildIndexScheduleTask::check_build_index_end(bool& build_index_end, bool&
         need_copy = true;
         if (need_copy) {
           if (OB_FAIL(ObPartitionService::get_instance().check_single_replica_major_sstable_exist(pkey_, index_id_))) {
-            if (OB_ENTRY_NOT_EXIST == ret) {
+            if (OB_ENTRY_NOT_EXIST == ret || OB_PG_PARTITION_NOT_EXIST == ret || OB_PARTITION_NOT_EXIST == ret) {
               ret = OB_SUCCESS;
             } else {
               STORAGE_LOG(WARN, "fail to check replica has major sstable", K(ret), K(pkey_), K(index_id_));
@@ -1261,7 +1269,11 @@ int ObBuildIndexScheduleTask::check_build_index_end(bool& build_index_end, bool&
         }
         if (REACH_TIME_INTERVAL(10 * 1000 * 1000)) {
           if (OB_FAIL(ObPartitionService::get_instance().get_curr_member_list(pkey_, member_list))) {
-            STORAGE_LOG(WARN, "fail to get current member list", K(ret), K(pkey_), K(index_id_));
+            if (OB_PG_PARTITION_NOT_EXIST == ret || OB_PARTITION_NOT_EXIST == ret || OB_ENTRY_NOT_EXIST == ret) {
+              ret = OB_SUCCESS;
+            } else {
+              STORAGE_LOG(WARN, "fail to get current member list", K(ret), K(pkey_), K(index_id_));
+            }
           } else if (!member_list.contains(build_index_server)) {
             if (OB_FAIL(rollback_state(WAIT_TRANS_END))) {
               STORAGE_LOG(WARN, "fail to rollback state", K(ret));
@@ -1316,7 +1328,11 @@ int ObBuildIndexScheduleTask::wait_choose_or_build_index_end(const bool is_leade
         STORAGE_LOG(WARN, "fail to check need schedule dag", K(ret), K(is_leader), K(pkey_), K(index_id_));
       } else if (need_schedule_dag) {
         if (OB_FAIL(schedule_dag())) {
-          STORAGE_LOG(WARN, "fail to schedule dag", K(ret), K(index_id_), K(pkey_));
+          if (OB_PG_PARTITION_NOT_EXIST == ret || OB_PARTITION_NOT_EXIST == ret || OB_ENTRY_NOT_EXIST == ret) {
+            ret = OB_SUCCESS;
+          } else {
+            STORAGE_LOG(WARN, "fail to schedule dag", K(ret), K(index_id_), K(pkey_));
+          }
         } else {
           ObTaskController::get().allow_next_syslog();
           STORAGE_LOG(INFO, "schedule build index dag", K(pkey_), K(index_id_));