cherry-pick omitted fixs to open-source branch

2021-07-19 23:12:15 +08:00
parent c949c5e01f
commit ae0ace666f
51 changed files with 141004 additions and 141679 deletions
--- a/src/storage/ob_partition_migrator.cpp
+++ b/src/storage/ob_partition_migrator.cpp
@ -12503,7 +12503,7 @@ int ObMigrateUtil::wait_trans_table_merge_finish(ObMigrateCtx& ctx)
    do {
      if (OB_FAIL(ObDagScheduler::get_instance().check_dag_exist(&fake_dag, exist))) {
        LOG_WARN("failed to check dag exist", K(ret), K(fake_dag));
-      } else if (!exist) {
+      } else if (exist) {
        if (ObTimeUtility::current_time() - start_ts > WAIT_TIMEOUT) {
          ret = OB_WAIT_TRANS_TABLE_MERGE_TIMEOUT;
          LOG_WARN("wait trans table merge finish timeout", K(ret), K(fake_dag));