You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by mp...@apache.org on 2018/05/29 23:44:30 UTC
[5/5] kudu git commit: KUDU-702 Add block IDs to more log messages
KUDU-702 Add block IDs to more log messages
Added block id to the log messages in the following cases:
1. Log Warnings during cfile read
2. VLOG on adding and removing unlocked blocks
Testing was performed by manually inspecting the log message
outputs generated by executing the affected statements.
Change-Id: I895da1cc04ecbf006f412f06b31461b03072d32d
Reviewed-on: http://gerrit.cloudera.org:8080/10505
Tested-by: Kudu Jenkins
Reviewed-by: Mike Percy <mp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/e840ad7e
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/e840ad7e
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/e840ad7e
Branch: refs/heads/master
Commit: e840ad7e914bcfaf188470e35634cbf4f477d148
Parents: 6662a90
Author: anupama <an...@cloudera.com>
Authored: Fri May 25 12:11:14 2018 -0700
Committer: Mike Percy <mp...@apache.org>
Committed: Tue May 29 23:06:20 2018 +0000
----------------------------------------------------------------------
src/kudu/cfile/cfile_reader.cc | 7 ++++---
src/kudu/cfile/index_btree.cc | 3 +--
src/kudu/fs/log_block_manager.cc | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/e840ad7e/src/kudu/cfile/cfile_reader.cc
----------------------------------------------------------------------
diff --git a/src/kudu/cfile/cfile_reader.cc b/src/kudu/cfile/cfile_reader.cc
index 60b7d19..3211751 100644
--- a/src/kudu/cfile/cfile_reader.cc
+++ b/src/kudu/cfile/cfile_reader.cc
@@ -488,8 +488,8 @@ Status CFileReader::ReadBlock(const BlockPointer &ptr, CacheControl cache_contro
CompressedBlockDecoder uncompressor(codec_, cfile_version_, block);
Status s = uncompressor.Init();
if (!s.ok()) {
- LOG(WARNING) << "Unable to validate compressed block at "
- << ptr.offset() << " of size " << block.size() << ": "
+ LOG(WARNING) << "Unable to validate compressed block " << block_id().ToString()
+ << " at " << ptr.offset() << " of size " << block.size() << ": "
<< s.ToString();
return s;
}
@@ -505,7 +505,8 @@ Status CFileReader::ReadBlock(const BlockPointer &ptr, CacheControl cache_contro
}
s = uncompressor.UncompressIntoBuffer(decompressed_scratch.get());
if (!s.ok()) {
- LOG(WARNING) << "Unable to uncompress block at " << ptr.offset()
+ LOG(WARNING) << "Unable to uncompress block " << block_id().ToString()
+ << " at " << ptr.offset()
<< " of size " << block.size() << ": " << s.ToString();
return s;
}
http://git-wip-us.apache.org/repos/asf/kudu/blob/e840ad7e/src/kudu/cfile/index_btree.cc
----------------------------------------------------------------------
diff --git a/src/kudu/cfile/index_btree.cc b/src/kudu/cfile/index_btree.cc
index 013496f..019777c 100644
--- a/src/kudu/cfile/index_btree.cc
+++ b/src/kudu/cfile/index_btree.cc
@@ -106,8 +106,7 @@ Status IndexTreeBuilder::Finish(BTreeInfoPB *info) {
BlockPointer ptr;
Status s = FinishAndWriteBlock(root_level, &ptr);
if (!s.ok()) {
- LOG(ERROR) << "Unable to flush root index block";
- return s;
+ return s.CloneAndPrepend("Unable to flush root index block");
}
VLOG(1) << "Flushed root index block: " << ptr.ToString();
http://git-wip-us.apache.org/repos/asf/kudu/blob/e840ad7e/src/kudu/fs/log_block_manager.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/log_block_manager.cc b/src/kudu/fs/log_block_manager.cc
index 7fb63e4..22360da 100644
--- a/src/kudu/fs/log_block_manager.cc
+++ b/src/kudu/fs/log_block_manager.cc
@@ -2038,8 +2038,8 @@ bool LogBlockManager::AddLogBlockUnlocked(scoped_refptr<LogBlock> lb) {
return false;
}
- VLOG(2) << Substitute("Added block: offset $0, length $1",
- lb->offset(), lb->length());
+ VLOG(2) << Substitute("Added block: id $0, offset $1, length $2",
+ lb->block_id().ToString(), lb->offset(), lb->length());
// There may already be an entry in open_block_ids_ (e.g. we just finished
// writing out a block).
@@ -2143,8 +2143,8 @@ Status LogBlockManager::RemoveLogBlockUnlocked(const BlockId& block_id,
*lb = std::move(it->second);
blocks_by_block_id_.erase(it);
- VLOG(2) << Substitute("Removed block: offset $0, length $1",
- (*lb)->offset(), (*lb)->length());
+ VLOG(2) << Substitute("Removed block: id $0, offset $1, length $2",
+ (*lb)->block_id().ToString(), (*lb)->offset(), (*lb)->length());
return Status::OK();
}