From d3cee584cbf5f283de35df35a478771dbd5dc16e Mon Sep 17 00:00:00 2001 From: obdev Date: Mon, 3 Jul 2023 12:24:15 +0000 Subject: [PATCH] optimize sys log --- src/storage/blocksstable/ob_sstable.cpp | 4 ++-- src/storage/tablet/ob_table_store_util.cpp | 26 +++++++--------------- src/storage/tablet/ob_tablet.cpp | 4 ++-- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/storage/blocksstable/ob_sstable.cpp b/src/storage/blocksstable/ob_sstable.cpp index f502505ac..db6ff6b17 100644 --- a/src/storage/blocksstable/ob_sstable.cpp +++ b/src/storage/blocksstable/ob_sstable.cpp @@ -122,7 +122,7 @@ int ObSSTable::init(const ObTabletCreateSSTableParam ¶m, common::ObArenaAllo void ObSSTable::reset() { - FLOG_INFO("reset sstable.", KP(this), K(key_), K(is_tmp_sstable_)); + LOG_DEBUG("reset sstable.", KP(this), K(key_), K(is_tmp_sstable_)); // dec ref first, then reset sstable meta if (is_tmp_sstable_) { ObSSTable::dec_macro_ref(); @@ -948,7 +948,7 @@ int ObSSTable::deserialize(common::ObArenaAllocator &allocator, } if (OB_SUCC(ret)) { - FLOG_INFO("succeed to deserialize sstable", K(status.pack_), KPC(this)); + LOG_DEBUG("succeed to deserialize sstable", K(status.pack_), KPC(this)); } else { pos = orig_pos; LOG_WARN("fail to deserialize sstable", K(ret), K(status.pack_), KPC(this)); diff --git a/src/storage/tablet/ob_table_store_util.cpp b/src/storage/tablet/ob_table_store_util.cpp index 37b2e89a5..40604a3dd 100755 --- a/src/storage/tablet/ob_table_store_util.cpp +++ b/src/storage/tablet/ob_table_store_util.cpp @@ -475,8 +475,6 @@ int ObSSTableArray::inc_meta_ref_cnt(bool &inc_success) const if (OB_ISNULL(table) || OB_UNLIKELY(!table->is_sstable())) { ret = OB_ERR_UNEXPECTED; LOG_ERROR("table is invalid", K(ret), KPC(table)); - // shouldn't abort after being merged into master !!! - ob_abort(); } else { ObSSTable *sstable = reinterpret_cast(table); addr = sstable->get_addr(); @@ -492,7 +490,7 @@ int ObSSTableArray::inc_meta_ref_cnt(bool &inc_success) const LOG_ERROR("fail to increase ref cnt for sstable meta's macro block", K(ret), K(macro_id)); } else { sstable_cnt++; - FLOG_INFO("barry debug inc sstable meta's macro ref", K(ret), K(macro_id), KPC(sstable)); + LOG_DEBUG("inc sstable meta's macro ref", K(ret), K(macro_id), KPC(sstable)); } } } @@ -517,7 +515,7 @@ int ObSSTableArray::inc_meta_ref_cnt(bool &inc_success) const } else if (OB_TMP_FAIL(OB_SERVER_BLOCK_MGR.dec_ref(macro_id))) { LOG_ERROR("fail to decrease ref cnt for sstable meta's macro block", K(tmp_ret), K(macro_id)); } else { - FLOG_INFO("barry debug decrease sstable meta's macro ref", K(tmp_ret), K(addr), K(macro_id), KPC(sstable)); + LOG_DEBUG("decrease sstable meta's macro ref", K(tmp_ret), K(addr), K(macro_id), KPC(sstable)); } } } @@ -527,7 +525,7 @@ int ObSSTableArray::inc_meta_ref_cnt(bool &inc_success) const inc_success = true; } - FLOG_INFO("barry debug the number of sstables that increase meta ref cnt", K(ret), K(sstable_cnt), K(lbt())); + LOG_DEBUG("the number of sstables that increase meta ref cnt", K(ret), K(sstable_cnt), K(lbt())); return ret; } @@ -545,8 +543,6 @@ int ObSSTableArray::inc_data_ref_cnt(bool &inc_success) const if (OB_ISNULL(table) || OB_UNLIKELY(!table->is_sstable())) { ret = OB_ERR_UNEXPECTED; LOG_ERROR("table is invalid", K(ret), KPC(table)); - // shouldn't abort after being merged into master !!! - ob_abort(); } else { ObSSTable *sstable = reinterpret_cast(table); if (OB_FAIL(sstable->inc_macro_ref(inc_data_block_success))) { @@ -554,7 +550,7 @@ int ObSSTableArray::inc_data_ref_cnt(bool &inc_success) const } else { sstable_cnt++; } - LOG_DEBUG("barry debug increase sstable data macro ref", K(ret), KPC(sstable)); + LOG_DEBUG("increase sstable data macro ref", K(ret), KPC(sstable)); } } @@ -565,12 +561,10 @@ int ObSSTableArray::inc_data_ref_cnt(bool &inc_success) const if (OB_ISNULL(table) || OB_UNLIKELY(!table->is_sstable())) { tmp_ret = OB_ERR_UNEXPECTED; LOG_ERROR("table is invalid", K(tmp_ret), KPC(table)); - // shouldn't abort after being merged into master !!! - ob_abort(); } else { ObSSTable *sstable = reinterpret_cast(table); sstable->dec_macro_ref(); - LOG_DEBUG("barry debug decrease sstable data macro ref", K(tmp_ret), KPC(sstable)); + LOG_DEBUG("decrease sstable data macro ref", K(tmp_ret), KPC(sstable)); } } } @@ -597,8 +591,6 @@ void ObSSTableArray::dec_meta_ref_cnt() const if (OB_ISNULL(table) || OB_UNLIKELY(!table->is_sstable())) { ret = OB_ERR_UNEXPECTED; LOG_ERROR("table is invalid", K(ret), KPC(table)); - // shouldn't abort after being merged into master !!! - ob_abort(); } else { ObSSTable *sstable = reinterpret_cast(table); addr = sstable->get_addr(); @@ -612,12 +604,12 @@ void ObSSTableArray::dec_meta_ref_cnt() const LOG_ERROR("fail to decrease ref cnt for sstable meta's macro block", K(ret), K(macro_id)); } else { sstable_cnt++; - FLOG_INFO("barry debug decrease sstable meta's macro ref", K(ret), K(macro_id), KPC(sstable)); + LOG_DEBUG("decrease sstable meta's macro ref", K(ret), K(macro_id), KPC(sstable)); } } } - FLOG_INFO("barry debug the number of sstables that decrease meta ref cnt", K(ret), K(sstable_cnt), K(lbt())); + LOG_DEBUG("the number of sstables that decrease meta ref cnt", K(ret), K(sstable_cnt), K(lbt())); } void ObSSTableArray::dec_data_ref_cnt() const @@ -631,13 +623,11 @@ void ObSSTableArray::dec_data_ref_cnt() const if (OB_ISNULL(table) || OB_UNLIKELY(!table->is_sstable())) { ret = OB_ERR_UNEXPECTED; LOG_ERROR("table is invalid", K(ret), KPC(table)); - // shouldn't abort after being merged into master !!! - ob_abort(); } else { sstable_cnt++; ObSSTable *sstable = reinterpret_cast(table); sstable->dec_macro_ref(); - LOG_DEBUG("barry debug decrease sstable data's macro ref", K(ret), KPC(sstable)); + LOG_DEBUG("decrease sstable data's macro ref", K(ret), KPC(sstable)); } } } diff --git a/src/storage/tablet/ob_tablet.cpp b/src/storage/tablet/ob_tablet.cpp index 8b217e5ad..3d64140f7 100755 --- a/src/storage/tablet/ob_tablet.cpp +++ b/src/storage/tablet/ob_tablet.cpp @@ -1619,7 +1619,7 @@ int ObTablet::inner_inc_macro_ref_cnt() } else { hold_ref_cnt_ = true; } - FLOG_INFO("barry debug the tablet that inner increases ref cnt is", + LOG_DEBUG("the tablet that inner increases ref cnt is", K(is_inited_), K(tablet_meta_.ls_id_), K(tablet_meta_.tablet_id_), K(table_store_addr_.addr_.is_valid()), K(auto_inc_seq_addr.addr_), K(storage_schema_addr_.addr_), K(medium_info_list_addr.addr_), K(tablet_status_uncommitted_kv_addr.addr_), K(tablet_status_committed_kv_addr.addr_), @@ -1672,7 +1672,7 @@ void ObTablet::dec_macro_ref_cnt() const ObTabletComplexAddr &medium_info_list_addr = mds_data_.medium_info_list_; const ObTabletComplexAddr &auto_inc_seq_addr = mds_data_.auto_inc_seq_; // We don't need to recursively decrease macro ref cnt, since we will push both them to gc queue - FLOG_INFO("barry debug the tablet that decreases ref cnt is", + LOG_DEBUG("the tablet that decreases ref cnt is", K(is_inited_), K(tablet_meta_.ls_id_), K(tablet_meta_.tablet_id_), K(table_store_addr_.addr_.is_valid()), K(auto_inc_seq_addr.addr_), K(storage_schema_addr_.addr_), K(medium_info_list_addr.addr_), K(tablet_status_uncommitted_kv_addr.addr_), K(tablet_status_committed_kv_addr.addr_),