diff --git a/src/rootserver/ddl_task/ob_constraint_task.cpp b/src/rootserver/ddl_task/ob_constraint_task.cpp
index 7665a815d4..c66425d5cb 100755
--- a/src/rootserver/ddl_task/ob_constraint_task.cpp
+++ b/src/rootserver/ddl_task/ob_constraint_task.cpp
@@ -1879,10 +1879,10 @@ int ObConstraintTask::check_health()
       switch_status(new_status, false, ret);
       LOG_WARN("switch status to build_failed", K(ret), K(old_status), K(new_status));
     }
-  }
-  if (ObDDLTaskStatus::FAIL == static_cast<ObDDLTaskStatus>(task_status_)
-      || ObDDLTaskStatus::SUCCESS == static_cast<ObDDLTaskStatus>(task_status_)) {
-    ret = OB_SUCCESS; // allow clean up
+    if (ObDDLTaskStatus::FAIL == static_cast<ObDDLTaskStatus>(task_status_)
+        || ObDDLTaskStatus::SUCCESS == static_cast<ObDDLTaskStatus>(task_status_)) {
+      ret = OB_SUCCESS; // allow clean up
+    }
   }
   return ret;
 }
diff --git a/src/rootserver/ddl_task/ob_ddl_redefinition_task.cpp b/src/rootserver/ddl_task/ob_ddl_redefinition_task.cpp
index e54eabf7d2..f2f5c0a00f 100644
--- a/src/rootserver/ddl_task/ob_ddl_redefinition_task.cpp
+++ b/src/rootserver/ddl_task/ob_ddl_redefinition_task.cpp
@@ -1293,10 +1293,10 @@ int ObDDLRedefinitionTask::check_health()
       switch_status(new_status, false, ret);
       LOG_WARN("switch status to build_failed", K(ret), K(old_status), K(new_status));
     }
-  }
-  if (ObDDLTaskStatus::FAIL == static_cast<ObDDLTaskStatus>(task_status_)
-      || ObDDLTaskStatus::SUCCESS == static_cast<ObDDLTaskStatus>(task_status_)) {
-    ret = OB_SUCCESS; // allow clean up
+    if (ObDDLTaskStatus::FAIL == static_cast<ObDDLTaskStatus>(task_status_)
+        || ObDDLTaskStatus::SUCCESS == static_cast<ObDDLTaskStatus>(task_status_)) {
+      ret = OB_SUCCESS; // allow clean up
+    }
   }
   check_ddl_task_execute_too_long();
   return ret;
diff --git a/src/rootserver/ddl_task/ob_ddl_retry_task.cpp b/src/rootserver/ddl_task/ob_ddl_retry_task.cpp
index 3d7e4b4ddd..5a6d39d1e4 100644
--- a/src/rootserver/ddl_task/ob_ddl_retry_task.cpp
+++ b/src/rootserver/ddl_task/ob_ddl_retry_task.cpp
@@ -538,10 +538,6 @@ int ObDDLRetryTask::check_health()
   } else if (OB_FAIL(refresh_schema_version())) {
     LOG_WARN("refresh schema version failed", K(ret));
   }
-  if (ObDDLTaskStatus::FAIL == static_cast<ObDDLTaskStatus>(task_status_)
-      || ObDDLTaskStatus::SUCCESS == static_cast<ObDDLTaskStatus>(task_status_)) {
-    ret = OB_SUCCESS; // allow clean up
-  }
   return ret;
 }
 
diff --git a/src/rootserver/ddl_task/ob_ddl_task.cpp b/src/rootserver/ddl_task/ob_ddl_task.cpp
index 91e419f269..ca067b2428 100644
--- a/src/rootserver/ddl_task/ob_ddl_task.cpp
+++ b/src/rootserver/ddl_task/ob_ddl_task.cpp
@@ -1058,7 +1058,7 @@ int ObDDLTask::refresh_schema_version()
     int64_t refreshed_schema_version = 0;
     if (OB_FAIL(schema_service.get_tenant_refreshed_schema_version(tenant_id_, refreshed_schema_version))) {
       LOG_WARN("get refreshed schema version failed", K(ret), K(tenant_id_));
-    } else if (refreshed_schema_version < schema_version_) {
+    } else if (!ObSchemaService::is_formal_version(refreshed_schema_version) || refreshed_schema_version < schema_version_) {
       ret = OB_SCHEMA_EAGAIN;
       if (REACH_TIME_INTERVAL(1000L * 1000L)) {
         LOG_INFO("tenant schema not refreshed to the target version", K(ret), K(tenant_id_), K(schema_version_), K(refreshed_schema_version));
diff --git a/src/rootserver/ddl_task/ob_index_build_task.cpp b/src/rootserver/ddl_task/ob_index_build_task.cpp
index 7ce82b5e10..1f4c3cf217 100755
--- a/src/rootserver/ddl_task/ob_index_build_task.cpp
+++ b/src/rootserver/ddl_task/ob_index_build_task.cpp
@@ -533,10 +533,10 @@ int ObIndexBuildTask::check_health()
       switch_status(new_status, false, ret);
       LOG_WARN("switch status to build_failed", K(ret), K(old_status), K(new_status));
     }
-  }
-  if (ObDDLTaskStatus::FAIL == static_cast<ObDDLTaskStatus>(task_status_)
-      || ObDDLTaskStatus::SUCCESS == static_cast<ObDDLTaskStatus>(task_status_)) {
-    ret = OB_SUCCESS; // allow clean up
+    if (ObDDLTaskStatus::FAIL == static_cast<ObDDLTaskStatus>(task_status_)
+        || ObDDLTaskStatus::SUCCESS == static_cast<ObDDLTaskStatus>(task_status_)) {
+      ret = OB_SUCCESS; // allow clean up
+    }
   }
   check_ddl_task_execute_too_long();
   return ret;
diff --git a/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp b/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp
index bdf46bddb0..ee12afb2af 100644
--- a/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp
+++ b/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp
@@ -557,10 +557,10 @@ int ObModifyAutoincTask::check_health()
       switch_status(new_status, false, ret);
       LOG_WARN("switch status to build_failed", K(ret), K(old_status), K(new_status));
     }
-  }
-  if (ObDDLTaskStatus::FAIL == static_cast<ObDDLTaskStatus>(task_status_)
-      || ObDDLTaskStatus::SUCCESS == static_cast<ObDDLTaskStatus>(task_status_)) {
-    ret = OB_SUCCESS; // allow clean up
+    if (ObDDLTaskStatus::FAIL == static_cast<ObDDLTaskStatus>(task_status_)
+        || ObDDLTaskStatus::SUCCESS == static_cast<ObDDLTaskStatus>(task_status_)) {
+      ret = OB_SUCCESS; // allow clean up
+    }
   }
   return ret;
 }