hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[bugfix] fix error print

Browse Source
This commit is contained in:
obdev
2022-11-30 12:05:44 +00:00
committed by ob-robot
parent ab7831f063
commit 07dbfbc4db
7 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/logservice/applyservice/ob_log_apply_service.cpp
View File

@ -772,7 +772,7 @@ int ObApplyStatus::diagnose(ApplyDiagnoseInfo &diagnose_info)
if (OB_FAIL(get_min_unapplied_scn(min_unapplied_scn))) {
CLOG_LOG(WARN, "get_min_unapplied_scn failed", KPC(this), K(ret));
} else {
diagnose_info.max_applied_scn_ = SCN::minus(min_unapplied_scn, 1);
diagnose_info.max_applied_scn_ = min_unapplied_scn.is_valid_and_not_min() ? SCN::minus(min_unapplied_scn, 1) : SCN::min_scn();
}
return ret;
}

1
src/logservice/ob_log_handler.cpp
View File

@ -1238,7 +1238,6 @@ int ObLogHandler::get_max_decided_scn(SCN &scn)
ret = OB_SUCCESS;
if (min_unapply_scn > SCN::base_scn()) {
scn = SCN::scn_dec(min_unapply_scn);
ret = OB_SUCCESS;
} else {
scn.set_min();
}

1
src/share/ob_zone_merge_info.h
View File

@ -47,6 +47,7 @@ public:
int set_scn(const uint64_t scn_val);
int set_scn(const uint64_t scn_val, const bool need_update);
const SCN &get_scn() const { return scn_; }
//this interface is just used for operations of reading or writing inner tables
uint64_t get_scn_val() const { return scn_.get_val_for_inner_table_field(); }
int64_t get_value() const { return value_; }

6
src/storage/compaction/ob_partition_merger.cpp
View File

@ -1942,13 +1942,13 @@ int ObPartitionMergeDumper::generate_dump_table_name(const char *dir_name,
STORAGE_LOG(WARN, "table is null", K(ret));
} else {
int64_t pret = snprintf(
file_name, OB_MAX_FILE_NAME_LENGTH, "%s/%s.%s.%ld.%s.%d.%s.%lu.%s.%lu",
file_name, OB_MAX_FILE_NAME_LENGTH, "%s/%s.%s.%ld.%s.%d.%s.%ld.%s.%ld",
dir_name,
table->is_memtable() ? "dump_memtable" : "dump_sstable",
"tablet_id", table->get_key().tablet_id_.id(),
"table_type", table->get_key().table_type_,
"start_scn", table->get_start_scn().get_val_for_inner_table_field(),
"end_scn", table->get_end_scn().get_val_for_inner_table_field());
"start_scn", table->get_start_scn().get_val_for_tx(),
"end_scn", table->get_end_scn().get_val_for_tx());
if (pret < 0 || pret >= OB_MAX_FILE_NAME_LENGTH) {
ret = OB_INVALID_ARGUMENT;
STORAGE_LOG(WARN, "name too long", K(ret), K(pret), K(file_name));

4
src/storage/compaction/ob_tenant_freeze_info_mgr.cpp
View File

@ -806,10 +806,10 @@ int ObTenantFreezeInfoMgr::ReloadTask::refresh_merge_info()
} else {
scheduler->resume_major_merge();
const int64_t scheduler_frozen_version = scheduler->get_frozen_version();
if (zone_merge_info.broadcast_scn_.get_scn_val() > scheduler_frozen_version) {
if (zone_merge_info.broadcast_scn_.get_scn().get_val_for_tx() > scheduler_frozen_version) {
FLOG_INFO("try to schedule merge", K(tenant_id), "zone", zone_merge_info.zone_, "broadcast_scn",
zone_merge_info.broadcast_scn_, K(scheduler_frozen_version));
if (OB_FAIL(scheduler->schedule_merge(zone_merge_info.broadcast_scn_.get_scn_val()))) {
if (OB_FAIL(scheduler->schedule_merge(zone_merge_info.broadcast_scn_.get_scn().get_val_for_tx()))) {
LOG_WARN("fail to schedule merge", K(ret), K(zone_merge_info));
}
}

2
src/storage/tx/ob_tx_log_adapter.cpp
View File

@ -44,7 +44,7 @@ int ObLSTxLogAdapter::submit_log(const char *buf,
SCN ts;
if (OB_ISNULL(log_handler_) || !log_handler_->is_valid() || NULL == buf || 0 == size
|| base_ts.convert_to_ts() > ObTimeUtility::current_time() + 86400000000L) {
|| (base_ts.is_valid() && base_ts.convert_to_ts() > ObTimeUtility::current_time() + 86400000000L)) {
ret = OB_INVALID_ARGUMENT;
TRANS_LOG(WARN, "invalid argument", K(ret), KP(log_handler_), KP(buf), K(size), K(base_ts));
} else if (OB_FAIL(log_handler_->append(buf, size, base_ts, need_nonblock, cb, lsn, ts))) {

3
src/storage/tx/wrs/ob_tenant_weak_read_cluster_service.cpp
View File

@ -415,9 +415,10 @@ int ObTenantWeakReadClusterService::start_service()
}
end_ts = ObTimeUtility::current_time();
const bool ignore_invalid = true;
ISTAT("start service done", KR(ret), K(tenant_id),
K_(in_service), K_(leader_epoch),
K_(current_version), "delta", end_ts - current_version_.convert_to_ts(),
K_(current_version), "delta", end_ts - current_version_.convert_to_ts(ignore_invalid),
K_(min_version), K_(max_version),
K(max_stale_time),
K_(all_valid_server_count),