You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by ad...@apache.org on 2017/08/24 03:57:11 UTC
[2/2] kudu git commit: log block manager: use unsigned int for
next_block_id_
log block manager: use unsigned int for next_block_id_
KUDU-1538 introduced 'next_block_id_' to keep track of unique block
ID that should be used for block creation. Currently, it is defined
as int64_t. However, it could be updated based on the value of
'max_block_id' which is uint64_t. Since block IDs are defined as
uint64_t both on disk (fs.proto) and in memory (block_id.h), it
makes more sense to treat 'next_block_id_' as uint64_t rather than
to convert it correctly to int64_t everywhere.
This patch changes the type of 'next_block_id_' to uint64_t to
avoid overflow due to conversion of unsigned int to int, which
can result in the reuse of an existing block ID. It does not add
a standalone test case because the failure is most likely to occur
in specific test-only scenarios.
Change-Id: Ib315b20719ef529331304df5c56c4242902524d4
Reviewed-on: http://gerrit.cloudera.org:8080/7796
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Reviewed-by: Todd Lipcon <to...@apache.org>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/b37bde72
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/b37bde72
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/b37bde72
Branch: refs/heads/master
Commit: b37bde72c47370293827a306532d9be15b1c5f40
Parents: dbfb92f
Author: hahao <ha...@cloudera.com>
Authored: Wed Aug 23 17:35:02 2017 -0700
Committer: Adar Dembo <ad...@cloudera.com>
Committed: Thu Aug 24 03:56:47 2017 +0000
----------------------------------------------------------------------
src/kudu/fs/file_block_manager.h | 2 +-
src/kudu/fs/log_block_manager.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/b37bde72/src/kudu/fs/file_block_manager.h
----------------------------------------------------------------------
diff --git a/src/kudu/fs/file_block_manager.h b/src/kudu/fs/file_block_manager.h
index f62c900..6c6cc81 100644
--- a/src/kudu/fs/file_block_manager.h
+++ b/src/kudu/fs/file_block_manager.h
@@ -127,7 +127,7 @@ class FileBlockManager : public BlockManager {
// For generating block IDs.
ThreadSafeRandom rand_;
- AtomicInt<int64_t> next_block_id_;
+ AtomicInt<uint64_t> next_block_id_;
// Protects 'dirty_dirs_'.
mutable simple_spinlock lock_;
http://git-wip-us.apache.org/repos/asf/kudu/blob/b37bde72/src/kudu/fs/log_block_manager.h
----------------------------------------------------------------------
diff --git a/src/kudu/fs/log_block_manager.h b/src/kudu/fs/log_block_manager.h
index 1474cee..0407841 100644
--- a/src/kudu/fs/log_block_manager.h
+++ b/src/kudu/fs/log_block_manager.h
@@ -408,7 +408,7 @@ class LogBlockManager : public BlockManager {
ObjectIdGenerator oid_generator_;
// For generating block IDs.
- AtomicInt<int64_t> next_block_id_;
+ AtomicInt<uint64_t> next_block_id_;
// Metrics for the block manager.
//