@@ -632,6 +632,29 @@ butil::Status Backup::GetGcSafePoint() {
632632 }
633633
634634 DINGO_LOG_IF (INFO, FLAGS_br_log_switch_backup_detail_detail) << response.DebugString ();
635+ if (FLAGS_br_log_switch_backup_detail) {
636+ DINGO_LOG (INFO) << " " ;
637+ DINGO_LOG (INFO) << " tenant id : " << dingodb::Constant::kDefaultTenantId
638+ << " safe point : " << response.safe_point () << " ("
639+ << Utils::ConvertTsoToDateTime (response.safe_point ()) << " )" ;
640+
641+ for (const auto & [id, safe_point] : response.tenant_safe_points ()) {
642+ DINGO_LOG (INFO) << " tenant id : " << id << " safe point : " << safe_point << " ("
643+ << Utils::ConvertTsoToDateTime (safe_point) << " )" ;
644+ }
645+
646+ DINGO_LOG (INFO) << " " ;
647+
648+ DINGO_LOG (INFO) << " tenant id : " << dingodb::Constant::kDefaultTenantId
649+ << " resolve lock safe point : " << response.resolve_lock_safe_point () << " ("
650+ << Utils::ConvertTsoToDateTime (response.resolve_lock_safe_point ()) << " )" ;
651+
652+ for (const auto & [id, safe_point] : response.tenant_resolve_lock_safe_points ()) {
653+ DINGO_LOG (INFO) << " tenant id : " << id << " resolve lock safe point : " << safe_point << " ("
654+ << Utils::ConvertTsoToDateTime (safe_point) << " )" ;
655+ }
656+ DINGO_LOG (INFO) << " " ;
657+ }
635658
636659 int64_t max_tenant_safe_points;
637660 int64_t min_tenant_resolve_lock_safe_points;
@@ -653,18 +676,24 @@ butil::Status Backup::GetGcSafePoint() {
653676
654677 // compare safe points
655678 if (backuptso_internal_ > max_tenant_safe_points && backuptso_internal_ <= min_tenant_resolve_lock_safe_points) {
656- DINGO_LOG (INFO) << " Backup safe point is " << backuptso_internal_;
679+ DINGO_LOG (INFO) << " Backup safe point is " << backuptso_internal_ << " "
680+ << Utils::ConvertTsoToDateTime (backuptso_internal_);
657681 } else {
658682 std::string s = fmt::format (
659- " Backup safe point is {}, but max tenant safe point is {}, min tenant resolve lock safe point is {}" ,
660- backuptso_internal_, max_tenant_safe_points, min_tenant_resolve_lock_safe_points);
683+ " Backup safe point is {}({}), but max tenant safe point is {}({}), min tenant resolve lock safe point is "
684+ " {}({})" ,
685+ backuptso_internal_, Utils::ConvertTsoToDateTime (backuptso_internal_), max_tenant_safe_points,
686+ Utils::ConvertTsoToDateTime (max_tenant_safe_points), min_tenant_resolve_lock_safe_points,
687+ Utils::ConvertTsoToDateTime (min_tenant_resolve_lock_safe_points));
661688 DINGO_LOG (ERROR) << s;
662689 return butil::Status (dingodb::pb::error::EILLEGAL_PARAMTETERS, s);
663690 }
664691
665- std::string s =
666- fmt::format (" # max tenant safe points : {} min tenant resolve lock safe points : {} backuptso(internal) : {}" ,
667- max_tenant_safe_points, min_tenant_resolve_lock_safe_points, backuptso_internal_);
692+ std::string s = fmt::format (
693+ " # max tenant safe points : {}({}) min tenant resolve lock safe points : {}({}) backuptso(internal) : {}({})" ,
694+ max_tenant_safe_points, Utils::ConvertTsoToDateTime (max_tenant_safe_points), min_tenant_resolve_lock_safe_points,
695+ Utils::ConvertTsoToDateTime (min_tenant_resolve_lock_safe_points), backuptso_internal_,
696+ Utils::ConvertTsoToDateTime (backuptso_internal_));
668697 std::cout << s << std::endl;
669698 DINGO_LOG (INFO) << s;
670699
0 commit comments