fix ttl issue 42550411 & 42561394 & 42635299

src/observer/ob_service.cpp

@@ -3758,7 +3758,6 @@ int ObService::broadcast_locations(const obrpc::ObPartitionBroadcastArg& arg, ob
 int ObService::ttl_request(const obrpc::ObTTLRequestArg &arg, obrpc::ObTTLResult &result)
 {
   int ret = OB_SUCCESS;
-  LOG_INFO("ttl_request run", K(ret), K(arg)); // todo@dazhi: just for debug
   if (OB_UNLIKELY(!inited_)) {
     ret = OB_NOT_INIT;
     LOG_WARN("service do not init", KR(ret), K(arg));
@@ -3766,7 +3765,7 @@ int ObService::ttl_request(const obrpc::ObTTLRequestArg &arg, obrpc::ObTTLResult
     ret = OB_INVALID_ARGUMENT;
     LOG_WARN("invalid argument", KR(ret), K(arg));
   } else if (OB_FAIL(ObTTLManager::get_instance().proc_rs_cmd(arg.tenant_id_, arg.task_id_,
-                      ObTTLRequestArg::TTLTriggerType::USER_TRIGGER_TYPE == arg.trigger_type_,
+                      TRIGGER_TYPE::USER_TRIGGER == arg.trigger_type_,
                       static_cast<ObTTLRequestArg::TTLRequestType>(arg.cmd_code_)))) {
     LOG_WARN("fail to process rs command", K(ret), K(arg));
   }

src/observer/table/ob_table_service.cpp

@@ -2295,12 +2295,12 @@ int ObTableTTLDeleteRowIterator::get_next_row(ObNewRow*& row)
         } else {
           cur_version_++;
         }
-        if (cur_version_ > max_version_) {
+        if (max_version_ > 0 && cur_version_ > max_version_) {
           max_version_cnt_++;
           cur_del_rows_++;
           is_last_row_ttl_ = false;
           break;
-        } else if (cell_ts + time_to_live_ < common::ObTimeUtility::current_time()) {
+        } else if (time_to_live_ > 0 && (cell_ts + time_to_live_ < ObTimeUtility::current_time())) {
           ttl_cnt_++;
           cur_del_rows_++;
           is_last_row_ttl_ = true;
@@ -2350,7 +2350,7 @@ int ObTableTTLDeleteRowIterator::init(const ObTableTTLOperation &ttl_operation)
   int ret = OB_SUCCESS;
   if (OB_UNLIKELY(!ttl_operation.is_valid())) {
     ret = OB_INVALID_ARGUMENT;
-    LOG_WARN("invalid ttl operation", K(ret));
+    LOG_WARN("invalid ttl operation", K(ret), K(ttl_operation));
   } else {
     time_to_live_ = ttl_operation.time_to_live_;
     max_version_ = ttl_operation.max_version_;

src/observer/table/ob_table_ttl_common.h

@@ -20,6 +20,7 @@ namespace oceanbase
 namespace observer
 {
 
+// value not greater than 0 is invalid, which is ignored in ttl task
 struct ObTTLPara final
 {
 public:
@@ -27,7 +28,7 @@ public:
                 max_version_(0) {}
   bool is_valid() const
   {
-    return ttl_ > 0 && max_version_ > 0;
+    return ttl_ > 0 || max_version_ > 0;
   }
   TO_STRING_KV(K_(ttl), K_(max_version));
 public:

src/observer/table/ob_table_ttl_manager.cpp

@@ -322,7 +322,7 @@ int ObTTLManager::check_cmd_state_valid(common::ObTTLTaskStatus current_state, c
   return ret;
 }
 
-int ObTTLManager::Transform_cmd_and_state(ObTTLRequestArg::TTLRequestType& cmd, 
+int ObTTLManager::transform_cmd_to_state(const ObTTLRequestArg::TTLRequestType& cmd, 
                                          common::ObTTLTaskStatus& state)
 {
   int ret = OB_SUCCESS;
@@ -341,35 +341,35 @@ int ObTTLManager::Transform_cmd_and_state(ObTTLRequestArg::TTLRequestType& cmd,
   return ret;
 }
 
-/*rs msg call*/
+// RS TTL message entrance
 int ObTTLManager::proc_rs_cmd(uint64_t tenant_id, uint64_t task_id, 
                               bool is_usr_trigger, ObTTLRequestArg::TTLRequestType cmd)
 {
   int ret = OB_SUCCESS;
   ObTTLTenantInfo* tenant_info = NULL;
-  common::ObTTLTaskStatus state;
-  bool is_create_tenant_task = false;
+  common::ObTTLTaskStatus expected_state;
+  bool need_create_tenant_info = false;
 
   common::ObSpinLockGuard guard(lock_);
-  if (OB_FAIL(Transform_cmd_and_state(cmd, state))) {
+  if (OB_FAIL(transform_cmd_to_state(cmd, expected_state))) {
     LOG_WARN("invalid cmd type", K(tenant_id), K(task_id), K(is_usr_trigger), K(cmd));
   } else {
-    is_create_tenant_task = (OB_TTL_TASK_RUNNING == state) ? true : false;
+    need_create_tenant_info = (OB_TTL_TASK_RUNNING == expected_state) ? true : false;
   }
   
   if (OB_FAIL(ret)) {
   } else if (!is_init_) {
     ret = OB_ENTRY_NOT_EXIST;
     LOG_WARN("ttl manager not init", K(tenant_id), K(task_id), K(is_usr_trigger));
-  } else if (OB_ISNULL(tenant_info = get_tenant_info(tenant_id, is_create_tenant_task))) {
+  } else if (OB_ISNULL(tenant_info = get_tenant_info(tenant_id, need_create_tenant_info))) {
     ret = OB_ENTRY_NOT_EXIST;
     LOG_WARN("fail to get ttl tenant info", K(tenant_id));
-  } else if (OB_FAIL(check_cmd_state_valid(tenant_info->state_, state))) {
+  } else if (OB_FAIL(check_cmd_state_valid(tenant_info->state_, expected_state))) {
     LOG_WARN("ttl cmd state machine is wrong", K(ret), K(tenant_id), K(task_id), K(is_usr_trigger));
   } else {
     tenant_info->cmd_type_ = cmd;
     if (OB_INVALID_ID == tenant_info->task_id_) {
-      if (OB_TTL_TASK_RUNNING == state) {
+      if (OB_TTL_TASK_RUNNING == expected_state) {
         //new ttl tenant
         tenant_info->task_id_ = task_id;
         tenant_info->is_usr_trigger_ = is_usr_trigger;
@@ -377,16 +377,16 @@ int ObTTLManager::proc_rs_cmd(uint64_t tenant_id, uint64_t task_id,
         tenant_info->need_check_ = true;
         tenant_info->is_dirty_ = true;
         LOG_INFO("new tenent info", K(ret), K(tenant_id), K(tenant_info->task_id_));
-      } else {
+      } else if (OB_INVALID_ID == tenant_info->task_id_) {
         ret = OB_INVALID_ARGUMENT;
-        LOG_WARN("invalid task id for current state", K(ret), K(state), K(tenant_id),
+        LOG_WARN("invalid task id for current state", K(ret), K(expected_state), K(tenant_id),
                                                       K(task_id), K(tenant_info->task_id_));
       }
-    } else if (tenant_info->state_ == state) {
-      //duplicate
-      LOG_INFO("tenant state is duplicated", K(ret), K(state));
+    } else if (tenant_info->state_ == expected_state) {
+      //duplicate msg
+      LOG_INFO("tenant state is duplicated", K(ret), K(expected_state));
     } else {
-      tenant_info->state_ = state;
+      tenant_info->state_ = expected_state;
       tenant_info->is_dirty_ = true;
     }
 
@@ -395,7 +395,7 @@ int ObTTLManager::proc_rs_cmd(uint64_t tenant_id, uint64_t task_id,
       tenant_info->rsp_time_ = ObTimeUtility::current_time();
     }
   }
-  LOG_INFO("finish process rs cmd", K(ret), K(tenant_id), K(task_id), K(state));
+  LOG_INFO("finish process rs cmd", K(ret), K(tenant_id), K(task_id), K(expected_state));
   return ret;
 }
 
@@ -405,10 +405,7 @@ void ObTTLManager::mark_tenant_need_check(uint64_t tenant_id)
   ObTTLTenantInfo* tenant_info = NULL;
   if (common::ObTTLUtil::check_can_process_tenant_tasks(tenant_id)) {
     common::ObSpinLockGuard guard(lock_);
-    if (OB_ISNULL(tenant_info = get_tenant_info(tenant_id, false))) {
-      ret = OB_ERR_UNEXPECTED;
-      LOG_WARN("fail to get ttl tenant info", K(ret));
-    } else if (!tenant_info->need_check_) {
+    if (OB_NOT_NULL(tenant_info = get_tenant_info(tenant_id, false))) {
       tenant_info->need_check_ = true;
     }
   }
@@ -500,7 +497,7 @@ int ObTTLManager::report_task_status(ObTTLTaskInfo& task_info, ObTTLPara& task_p
   }
 
   //schedule task
-  if (is_stop && OB_FAIL(try_schedule_next_task(tenant_info))) {
+  if (is_stop && OB_FAIL(try_schedule_remaining_tasks(tenant_info))) {
     LOG_WARN("fail to try schedule task", K(ret));
   } 
   return ret;
@@ -770,7 +767,7 @@ int ObTTLManager::inner_handle_one_partition_event(ObTTLTenantInfo* tenant_info,
   
   if (OB_ISNULL(ctx) || OB_ISNULL(tenant_info)) {
     ret = OB_ERR_NULL_VALUE;
-    LOG_WARN("tenant info ot ctx is null", K(ret), K(tenant_info), K(ctx));
+    LOG_WARN("tenant info or ctx is null", K(ret), K(tenant_info), K(ctx));
   } else if (ctx->task_status_ != tenant_info->state_) {
     if (OB_TTL_TASK_RUNNING == tenant_info->state_) {
       if (OB_TTL_TASK_PENDING == ctx->task_status_) {
@@ -793,7 +790,11 @@ int ObTTLManager::inner_handle_one_partition_event(ObTTLTenantInfo* tenant_info,
     }
 
     if (try_schedule && OB_FAIL(try_schedule_task(tenant_info, ctx))) {
+      if (OB_EAGAIN != ret) {
         LOG_WARN("fail to try schedule dag task", K(ret), K(ctx->task_info_.pkey_));
+      } else {
+        ret = OB_SUCCESS;
+      }
     }
     LOG_DEBUG("handle one partition event", K(ret), K(ctx->task_status_), K(tenant_info->state_));
   }
@@ -880,9 +881,11 @@ int ObTTLManager::get_ttl_para_from_schema(const schema::ObTableSchema *table_sc
     } else {
       para.ttl_ =  hc_desc.get_time_to_live();
       para.max_version_ = hc_desc.get_max_version();
+      if (OB_LIKELY(para.is_valid())) {
         can_ttl = true;
         LOG_DEBUG("success to find a ttl partition", K(ret), K(para));
       }
+    }
   } else {}
   return ret;
 }
@@ -939,7 +942,11 @@ int ObTTLManager::try_schedule_prepare_task(ObPartitionKey& pkey)
     // do nothing
   } else if (FALSE_IT(ctx->task_status_ = OB_TTL_TASK_PENDING)) {
   } else if (OB_FAIL(try_schedule_task(tenant_info, ctx))) {
+    if (OB_EAGAIN != ret) {
       LOG_WARN("fail to schedule task", K(ret));
+    } else {
+      ret = OB_SUCCESS;
+    }
   } 
   LOG_DEBUG("try schedule prepare task", K(ret), K(pkey.get_tenant_id()), K(pkey.get_table_id()));
   return ret;
@@ -964,7 +971,7 @@ int ObTTLManager::sync_sys_table(ObPartitionKey& pkey)
       LOG_WARN("ctx is null", K(ret));
     } else if (OB_UNLIKELY(!ctx->is_valid())) {
       ret = OB_INVALID_ARGUMENT;
-      LOG_WARN("invalid partition task ctx", K(ret), K(ctx));
+      LOG_WARN("invalid partition task ctx", K(ret), KPC(ctx));
     } else {
       cp_ctx = *ctx;
       if (ctx->task_info_.row_key_.empty()) {
@@ -1123,6 +1130,7 @@ int ObTTLManager::construct_task_record_filter(const uint64_t& task_id,
   return ret;
 }
 
+// deprecated
 int ObTTLManager::deep_copy_all_tenant_ctxs(common::ObSArray<ObTTLTaskCtx>& ctx_array, 
                                             common::ObArenaAllocator& allocator,
                                             uint64_t tenant_id)
@@ -1294,7 +1302,7 @@ bool ObTTLManager::can_schedule_task(const ObTTLTaskCtx &ttl_task)
   return ttl_task.task_status_ == OB_TTL_TASK_PENDING || ttl_task.task_status_ == OB_TTL_TASK_PREPARE;
 }
 
-int ObTTLManager::try_schedule_next_task(ObTTLTenantInfo* tenant_info)
+int ObTTLManager::try_schedule_remaining_tasks(ObTTLTenantInfo* tenant_info)
 {
   int ret = OB_SUCCESS;
   if (OB_ISNULL(tenant_info)) {
@@ -1311,16 +1319,20 @@ int ObTTLManager::try_schedule_next_task(ObTTLTenantInfo* tenant_info)
         LOG_ERROR("fatal err, ttl ctx in map is null", K(ret), K(tenant_info->tenant_id_));
       } else if (can_schedule_task(*ctx)) {
         if (OB_FAIL(try_schedule_task(tenant_info, ctx))) {
+          if (OB_EAGAIN != ret) {
             LOG_WARN("fail to schedule task", K(ret));
-        } else {
-          ret = OB_ITER_END;
           }
         }
       }
     }
+    if (OB_EAGAIN == ret) {
+      ret = OB_SUCCESS;
+    }
+  }
   return ret;
 }
 
+// try schedule partition task, reutrn OB_EAGAIN if dag scheduler is full 
 int ObTTLManager::try_schedule_task(ObTTLTenantInfo* tenant_info, ObTTLTaskCtx* ctx)
 {
   int ret = OB_SUCCESS;
@@ -1328,9 +1340,7 @@ int ObTTLManager::try_schedule_task(ObTTLTenantInfo* tenant_info, ObTTLTaskCtx*
     LOG_WARN("invalid argument", K(ret), KP(tenant_info), KP(ctx));
   } else if (can_schedule_tenant(*tenant_info) && can_schedule_task(*ctx)) {
     if (OB_FAIL(generate_ttl_dag(ctx->task_info_, ctx->ttl_para_))) {
-      if (OB_SIZE_OVERFLOW != ret) {
-        ret = OB_SUCCESS;
-      } else {
+      if (OB_EAGAIN != ret) {
         LOG_WARN("fail to generate dag task", K(ret));
       }
     } else {

src/observer/table/ob_table_ttl_manager.h

@@ -24,9 +24,6 @@ namespace oceanbase
 namespace observer
 {
 
-using storage::ObIPartitionGroup;
-
-
 struct ObTTLTaskCtx
 {
 public :
@@ -63,20 +60,6 @@ public:
   bool                    is_dirty_;
 };
 
-class ObTTLEventTask : public common::ObDLinkBase<ObTTLEventTask>
-{
-public:
-  ObTTLEventTask(): ttl_key_(),
-                    partition_cnt_(OB_INVALID_INDEX),
-                    next_free_slot_(OB_INVALID_INDEX)
-                    {}
-  ObTTLStatusKey ttl_key_;
-  int64_t partition_cnt_;
-
-  uint64_t next_free_slot_;
-  uint64_t slot_id_;
-};
-
 class OBTTLTimerPeriodicTask : public common::ObTimerTask {
 public: 
   OBTTLTimerPeriodicTask() {}
@@ -97,7 +80,7 @@ public:
                   bool is_usr_trigger, obrpc::ObTTLRequestArg::TTLRequestType cmd);
   int report_task_status(ObTTLTaskInfo& task_info, 
                          ObTTLPara& task_para, bool& is_stop);
-  void on_leader_active(ObIPartitionGroup* partition);
+  void on_leader_active(storage::ObIPartitionGroup* partition);
   void on_schema_changed(uint64_t schema_changed_tenant_id);
   
   /*timer handle function*/
@@ -159,7 +142,7 @@ private:
   int generate_one_partition_task(ObTTLTaskInfo& task_info, ObTTLPara& para);
   int get_ttl_para_from_schema(const share::schema::ObTableSchema *table_schema, 
                            ObTTLPara& para, bool& is_tableapi_schema);
-  int check_partition_can_gen_ttl(ObIPartitionGroup *partition,
+  int check_partition_can_gen_ttl(storage::ObIPartitionGroup *partition,
                                   ObTTLPara &para, bool& can_ttl);
   int check_and_do_rsp(uint64_t tenant_id);
   void mark_tenant_need_check(uint64_t tenant_id);
@@ -180,7 +163,7 @@ private:
   int sync_sys_table(ObPartitionKey& pkey);
   int construct_sys_table_record(ObTTLTaskCtx* ctx, common::ObTTLStatus& ttl_record);
   int try_schedule_task(ObTTLTenantInfo* tenant_info, ObTTLTaskCtx* ctx);
-  int try_schedule_next_task(ObTTLTenantInfo* tenant_info);
+  int try_schedule_remaining_tasks(ObTTLTenantInfo* tenant_info);
   bool can_schedule_tenant(const ObTTLTenantInfo &tenant_info);
   bool can_schedule_task(const ObTTLTaskCtx &ttl_task);
   int check_cmd_state_valid(common::ObTTLTaskStatus current_state, common::ObTTLTaskStatus incoming_state);
@@ -190,7 +173,7 @@ private:
                                   common::ObArenaAllocator& allocator);
   void mark_ttl_ctx_dirty(ObTTLTenantInfo* tenant_info, ObTTLTaskCtx* ctx);
   void check_ttl_tenant_state(uint64_t tenant_id);
-  int Transform_cmd_and_state(obrpc::ObTTLRequestArg::TTLRequestType& cmd, common::ObTTLTaskStatus& state);
+  int transform_cmd_to_state(const obrpc::ObTTLRequestArg::TTLRequestType& cmd, common::ObTTLTaskStatus& state);
   int try_schedule_prepare_task(ObPartitionKey& pkey);
   void mark_tenant_checked(uint64_t tenant_id);
   int mark_tenant_droped(const uint64_t& tenant_id);

src/observer/table/ob_table_ttl_task.cpp

@@ -280,6 +280,7 @@ int ObTableTTLDeleteTask::process()
 int ObTableTTLDeleteTask::process_one()
 {
   int ret = OB_SUCCESS;
+  int64_t start_time = ObTimeUtil::current_time();
   ObPartitionKey pkey = info_->pkey_;
   uint64_t tenant_id = pkey.get_tenant_id();
   uint64_t table_id = pkey.get_table_id();
@@ -339,7 +340,8 @@ int ObTableTTLDeleteTask::process_one()
     info_->err_code_ = ret; 
     LOG_DEBUG("finish delete", K(ret), KPC_(info));
   }
-  LOG_DEBUG("finish process one", K(ret), K(result.get_max_version_del_row()), K(result.get_ttl_del_row()), K(result.get_del_row()));
+  int64_t cost = ObTimeUtil::current_time() - start_time;
+  LOG_DEBUG("finish process one", K(ret), K(cost), K(result.get_max_version_del_row()), K(result.get_ttl_del_row()), K(result.get_del_row()));
   return ret;
 }
 

src/rootserver/ob_ttl_scheduler.h

@@ -21,8 +21,9 @@ namespace rootserver
 {
 class ObRootService;
 
-typedef common::ObArray<common::ObAddr> ServerList;
-typedef common::hash::ObHashSet<common::ObAddr> ServerInfoSet;
+class ObTTLServerInfo;
+typedef common::ObArray<ObTTLServerInfo> TTLServerInfos;
+typedef common::hash::ObHashSet<common::ObAddr> ServerSet;
 
 /**
  * the task for clear ttl history task in __all_ttl_task_status_history
@@ -35,32 +36,41 @@ public:
   virtual void runTimerTask() override;
   void destroy() {}
 
+  static const int64_t OB_KV_TTL_GC_INTERVAL =  120 * 1000L * 1000L; // 120s 
 private:
   ObRootService& root_service_;
 };
 
-typedef struct RsTenantTask {
-  common::ObTTLStatus ttl_status_;
-  ServerList send_servers_;
-  ServerList eliminate_servers_;
-  ServerList rsp_servers_;
-  bool all_responsed_;
+struct ObTTLServerInfo
+{
+public:
+  ObTTLServerInfo() : addr_(), is_responsed_(false) {}
+  ~ObTTLServerInfo() = default;
+  TO_STRING_KV(K_(addr), K_(is_responsed));
+public:
+  common::ObAddr addr_; 
+  bool is_responsed_;
+};
 
+struct RsTenantTask
+{
+public:
   RsTenantTask() 
-    : ttl_status_(),
-      send_servers_(),
-      eliminate_servers_(),
-      rsp_servers_(),
-      all_responsed_(false) {}
-
-TO_STRING_KV(K_(ttl_status),
-             K_(send_servers),
-             K_(eliminate_servers),
-             K_(rsp_servers),
+    : ttl_status_(), server_infos_(), all_responsed_(false)
+  {}
+  ~RsTenantTask() = default;
+  int set_server_responsed(const ObAddr& server_addr);
+  void set_servers_not_responsed();
+  TO_STRING_KV(K_(ttl_status),
+               K_(server_infos),
                K_(all_responsed));
-} RsTenantTask;
+public:
+  common::ObTTLStatus ttl_status_;
+  common::ObArray<ObTTLServerInfo> server_infos_;
+  bool all_responsed_;
+};
 
-typedef struct ObTTLTenantTask {
+struct ObTTLTenantTask {
   ObArray<RsTenantTask> tasks_;
   bool need_refresh_;
   uint64_t tenant_id_;
@@ -82,7 +92,7 @@ typedef struct ObTTLTenantTask {
                K_(need_refresh),
                K_(tenant_id),
                K_(is_del));
-} ObTTLTenantTask;
+};
 
 /*
  * the scheduler for all ttl and max version deletion tasks executed in root service
@@ -93,7 +103,7 @@ typedef struct ObTTLTenantTask {
 class ObTTLScheduler : private common::ObTimerTask
 {
 public:
-  static const int64_t SCHEDULE_PERIOD = 20 * 1000L * 1000L; // 20s 
+  static const int64_t SCHEDULE_PERIOD = 15 * 1000L * 1000L; // 15s 
   explicit ObTTLScheduler(ObRootService& rs) 
     : is_inited_(false),
       root_service_(rs),
@@ -156,7 +166,7 @@ private:
       need_refresh_(true),
       is_inited_(false) {}
 
-  int update_task_on_responsed(RsTenantTask& task);
+  int update_task_on_all_responsed(RsTenantTask& task);
 
   virtual bool is_enable_ttl(uint64_t tenant_id);
 
@@ -177,29 +187,22 @@ private:
   bool tenant_exist(uint64_t tenant_id);
   virtual int update_tenant_tasks(uint64_t tenant_id, common::ObTTLStatusArray& tasks);
 
-  virtual int get_alive_servers(uint64_t tenant_id,
-                        ServerList& server_infos);
+  int get_server_infos(uint64_t tenant_id,
+                       common::ObArray<ObTTLServerInfo>& server_infos);
   /* variables */
   virtual int fetch_ttl_task_id(uint64_t tenant_id, int64_t &new_task_id);
   // RS-> observer ttl request
-  virtual int dispatch_ttl_request(ServerList& addrs, 
-                                   ServerList& eliminate_addrs, 
-                                   uint64_t tenant_id,
-                                   int ttl_cmd,
-                                   int trigger_type,
-                                   int64_t task_id);
-  virtual int get_valid_servers(ServerList& all_list, ServerList& remove_list, ServerList& ret_list);
+  virtual int dispatch_ttl_request(const common::ObArray<ObTTLServerInfo>& server_infos, 
+                                   uint64_t tenant_id, int ttl_cmd,
+                                   int trigger_type, int64_t task_id);
 
   int add_tenant(uint64_t tenant_id);
   void delete_tenant(uint64_t tenant_id);
   bool need_refresh_tenant(uint64_t tenant_id);
-  bool need_task_retry(RsTenantTask& rs_task);
+  bool need_retry_task(RsTenantTask& rs_task);
   // need lock
-  int get_tenant_tasks_ptr(uint64_t tenant_id,
-                           ObTTLTenantTask*& tasks_ptr);
-  int get_task_ptr(uint64_t tenant_id,
-                    uint64_t task_id, 
-                    RsTenantTask*& ten_task);
+  int get_tenant_ptr(uint64_t tenant_id, ObTTLTenantTask*& tasks_ptr);
+  int get_task_ptr(uint64_t tenant_id, uint64_t task_id, RsTenantTask*& ten_task);
   int user_cmd_upon_task(ObTTLTaskType task_type,
                          ObTTLTaskStatus curr_state,
                          ObTTLTaskStatus &next_state,
@@ -219,8 +222,6 @@ private:
 
   void refresh_deleted_tenants();
 
-  bool is_addr_exist(ServerList& addr_arr, const ObAddr& addr);
-
 private:
   lib::ObMutex mutex_; // lib::ObMutexGuard guard(mutex_);
   ObArray<ObTTLTenantTask> ten_task_arr_;
@@ -229,7 +230,7 @@ private:
   bool is_inited_;
 
 
-  const int64_t OB_TTL_TASK_RETRY_INTERVAL = ObTTLScheduler::SCHEDULE_PERIOD * 15; // retry interval 300s
+  const int64_t OB_TTL_TASK_RETRY_INTERVAL = 60*1000*1000; // 3min
 };
 
 #define TTLMGR ObTTLTenantTaskMgr::get_instance()

src/share/ob_rpc_struct.h

@@ -8409,12 +8409,6 @@ public:
     TTL_INVALID_TYPE = 5 
   };
   
-  enum TTLTriggerType {
-    SYS_TRIGGER_TYPE = 1,
-    USER_TRIGGER_TYPE,
-    INVALID_TRIGGER_TYPE,
-  };
-
   ObTTLRequestArg()
     : cmd_code_(-1), trigger_type_(-1), task_id_(OB_INVALID_ID), tenant_id_(OB_INVALID_ID)
   {}

src/share/table/ob_table.h

@@ -340,7 +340,7 @@ public:
   bool is_valid() const
   {
     return OB_INVALID_TENANT_ID != tenant_id_ && OB_INVALID_ID != table_id_ &&
-           max_version_ > 0 && time_to_live_ > 0 && del_row_limit_ > 0;
+           (max_version_ > 0 || time_to_live_ > 0) && del_row_limit_ > 0;
   }
   TO_STRING_KV(K_(tenant_id), K_(table_id), K_(max_version),  K_(time_to_live), K_(del_row_limit), K_(start_rowkey), K_(start_qualifier));
 public:

src/share/table/ob_ttl_util.cpp

@@ -445,7 +445,11 @@ bool ObTTLUtil::check_can_process_tenant_tasks(uint64_t tenant_id)
     bool is_restore = true;
     if (OB_FAIL(share::schema::ObMultiVersionSchemaService::get_instance().
                   check_tenant_is_restore(NULL, tenant_id, is_restore))) {
-      LOG_WARN("fail to check tenant is restore", KR(ret), K(tenant_id));
+      if (OB_TENANT_NOT_EXIST != ret) {
+        LOG_WARN("fail to check tenant is restore", KR(ret), K(tenant_id), K(common::lbt()));
+      } else {
+        ret = OB_SUCCESS;
+      }
     } else {
       bret = !is_restore;
     }

src/share/table/ob_ttl_util.h

@@ -26,8 +26,8 @@ namespace common
 
 enum TRIGGER_TYPE
 {
-  PERIODIC_TRIGGER = 1,
-  USER_TRIGGER
+  PERIODIC_TRIGGER = 0,
+  USER_TRIGGER = 1,
 };
 
 enum ObTTLTaskType {
@@ -41,18 +41,18 @@ enum ObTTLTaskType {
 
 enum ObTTLTaskStatus 
 { 
+  // for obsever
   OB_TTL_TASK_PREPARE = 0,  //inner state
   OB_TTL_TASK_RUNNING = 1,
   OB_TTL_TASK_PENDING = 2,
   OB_TTL_TASK_CANCEL  = 3,
   OB_TTL_TASK_FINISH  = 4,  //inner state
   OB_TTL_TASK_MOVING  = 5,
-
+  // for rs
   OB_RS_TTL_TASK_CREATE = 15,
-  OB_RS_TTL_TASK_SUSPEND,
-
-  OB_RS_TTL_TASK_CANCEL,
-  OB_RS_TTL_TASK_MOVE,
+  OB_RS_TTL_TASK_SUSPEND = 16,
+  OB_RS_TTL_TASK_CANCEL = 17,
+  OB_RS_TTL_TASK_MOVE = 18,
 
   OB_TTL_TASK_INVALID 
 };

src/sql/engine/expr/ob_expr_json_func_helper.h

@@ -22,8 +22,6 @@
 #include "lib/json_type/ob_json_base.h"
 #include "lib/json_type/ob_json_parse.h"
 
-using namespace oceanbase::common;
-
 namespace oceanbase
 {
 namespace sql

unittest/observer/tableapi/test_tableapi.cpp

@@ -675,6 +675,7 @@ TEST_F(TestTableTTL, dag_report)
 }
 #endif 
 
+#if 0
 class TestRsTTL : public::testing::Test {
 public:
   TestRsTTL() {};
@@ -829,7 +830,6 @@ void TestRsTTL::TearDown()
  * send msg
  * insert into table
 */
-#if 0
 TEST_F(TestRsTTL, ttl_basic)
 {
   int ret = OB_SUCCESS;