diff --git a/src/rootserver/ob_index_builder.cpp b/src/rootserver/ob_index_builder.cpp
index dd0c2771c95e6c50e99423e9b594956ccedb9a54..50ec8b10285399f6fb96ebcf2b5ee29e23ee38c9 100644
--- a/src/rootserver/ob_index_builder.cpp
+++ b/src/rootserver/ob_index_builder.cpp
@@ -540,6 +540,7 @@ int ObRSBuildIndexTask::process()
     if (OB_FAIL(report_index_status(index_status))) {
       LOG_WARN("fail to report index status", K(ret));
       need_retry_ = true;
+      need_release_snapshot = false;
     }
   }
   if (need_release_snapshot) {
diff --git a/src/sql/engine/cmd/ob_index_executor.cpp b/src/sql/engine/cmd/ob_index_executor.cpp
index c556b280334949a4fe2113925fd774b38d94763b..fd3fcb8ccd0b87dc931e9cd9729986f5b47e3725 100644
--- a/src/sql/engine/cmd/ob_index_executor.cpp
+++ b/src/sql/engine/cmd/ob_index_executor.cpp
@@ -235,12 +235,8 @@ int ObCreateIndexExecutor::sync_check_index_status(sql::ObSQLSessionInfo& my_ses
       LOG_WARN("fail to get index table schema", KR(ret), K(refreshed_schema_version), K(index_table_id));
     } else if (OB_ISNULL(index_schema)) {
       // maybe ddl(drop index,drop table,truncate table) in another session has dropped this index.
-      if (!is_update_global_indexes) {
-        ret = OB_ERR_ADD_INDEX;
-        LOG_USER_ERROR(OB_ERR_ADD_INDEX);
-      } else {
-        ret = OB_ERR_UNEXPECTED;
-      }
+      ret = OB_ERR_ADD_INDEX;
+      LOG_USER_ERROR(OB_ERR_ADD_INDEX);
       LOG_WARN("index table schema is null",
           KR(ret),
           K(index_table_id),