unregister ddl kv manager after ddl commit

src/storage/ddl/ob_complement_data_task.cpp

@@ -1243,11 +1243,11 @@ int ObComplementMergeTask::add_build_hidden_table_sstable()
     } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->wait_ddl_commit(ddl_start_log_ts, prepare_log_ts))) {
       LOG_WARN("wait ddl commit failed", K(ret), K(ls_id), K(tablet_id), K(hidden_table_key),
           K(ddl_start_log_ts), "new_ddl_start_log_ts", ddl_kv_mgr_handle.get_obj()->get_start_log_ts());
-    } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->unregister_from_tablet(ddl_start_log_ts, ddl_kv_mgr_handle))) {
-      LOG_WARN("ddl kv mgr unregister failed", K(ret), KPC(param_));
     } else if (OB_FAIL(context_->data_sstable_redo_writer_.write_commit_log(hidden_table_key,
                                                                             prepare_log_ts))) {
       LOG_WARN("fail write ddl commit log", K(ret), K(hidden_table_key));
+    } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->unregister_from_tablet(ddl_start_log_ts, ddl_kv_mgr_handle))) {
+      LOG_WARN("ddl kv mgr unregister failed", K(ret), KPC(param_));
     }
   }
   return ret;

src/storage/ddl/ob_direct_insert_sstable_ctx.cpp

@@ -712,11 +712,11 @@ int ObSSTableInsertTabletContext::create_sstable_with_clog(
       } else {
         LOG_WARN("failed to wait ddl kv commit", K(ret), K(ddl_start_log_ts), K(build_param_));
       }
-    } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->unregister_from_tablet(ddl_start_log_ts, ddl_kv_mgr_handle))) {
-      LOG_WARN("ddl kv mgr unregister failed", K(ret), K(build_param_));
     } else if (OB_FAIL(data_sstable_redo_writer_.write_commit_log(table_key,
                                                                   prepare_log_ts))) {
       LOG_WARN("fail write ddl commit log", K(ret), K(table_key));
+    } else if (OB_FAIL(ddl_kv_mgr_handle.get_obj()->unregister_from_tablet(ddl_start_log_ts, ddl_kv_mgr_handle))) {
+      LOG_WARN("ddl kv mgr unregister failed", K(ret), K(build_param_));
     }
   }
   return ret;