cherry-pick from 3_1_x_release to 3.1_opensource_release

2021-07-26 10:42:25 +08:00
parent f2f91f98c6
commit 821da37d63
29 changed files with 318 additions and 368 deletions
--- a/src/storage/ob_garbage_collector.cpp
+++ b/src/storage/ob_garbage_collector.cpp
@ -283,7 +283,7 @@ void ObGarbageCollector::run1()
    int ret = OB_SUCCESS;
    TenantSet gc_tenant_set;
    ObGCCandidateArray gc_candidates;
-    const int64_t gc_interval = GC_INTERVAL;
+    int64_t gc_interval = GC_INTERVAL;
 #ifdef ERRSIM
    gc_interval = std::min(gc_interval, (int64_t)ObServerConfig::get_instance().schema_drop_gc_delay_time);
 #endif