This is an automated email from the ASF dual-hosted git repository.
awong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new 4457c1a tablet: fix linker error
4457c1a is described below
commit 4457c1a66b57db6252ff9a07f0fcf57239114af6
Author: Andrew Wong <[email protected]>
AuthorDate: Thu Jun 4 15:16:53 2020 -0700
tablet: fix linker error
Following 97d775ae883181645dfcbbf1c4c18affc130ea78, building on Centos 6
in release mode nets me:
lib/../src/kudu/tablet/CMakeFiles/tablet_test_util.dir/tablet_replica-test-base.cc.o:
In function `kudu::tablet::TabletReplicaTestBase::RestartReplica()':
/data/8/awong/Repositories/kudu/build/release/../../src/kudu/tablet/tablet_replica-test-base.cc:167:
undefined reference to
`kudu::tablet::BootstrapTablet(scoped_refptr<kudu::tablet::TabletMetadata>,
kudu::consensus::RaftConfigPB, kudu:
:clock::Clock*, std::shared_ptr<kudu::MemTracker>,
scoped_refptr<kudu::rpc::ResultTracker>, kudu::MetricRegistry*,
kudu::FileCache*, scoped_refptr<kudu::tablet::TabletReplica>,
scoped_refptr<kudu::log::LogAnchorRegistry>, std::shared_pt
r<kudu::tablet::Tablet>*, scoped_refptr<kudu::log::Log>*,
kudu::consensus::ConsensusBootstrapInfo*)'
Seems like the tablet submodule wasn't being linked into
tablet-test-util. Also fixed some relevant spacing.
Change-Id: I364d83cff7f20868f818270daac4d3529ca84dfc
Reviewed-on: http://gerrit.cloudera.org:8080/16033
Reviewed-by: Alexey Serbin <[email protected]>
Tested-by: Kudu Jenkins
---
src/kudu/tablet/CMakeLists.txt | 3 ++-
src/kudu/tablet/tablet_replica-test-base.cc | 36 ++++++++++++++---------------
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/kudu/tablet/CMakeLists.txt b/src/kudu/tablet/CMakeLists.txt
index d9c8772..c441e85 100644
--- a/src/kudu/tablet/CMakeLists.txt
+++ b/src/kudu/tablet/CMakeLists.txt
@@ -89,7 +89,8 @@ add_library(tablet_test_util
tablet_replica-test-base.cc)
target_link_libraries(tablet_test_util
kudu_common
- log_proto)
+ log_proto
+ tablet)
SET_KUDU_TEST_LINK_LIBS(tablet tablet_test_util)
ADD_KUDU_TEST(all_types-scan-correctness-test NUM_SHARDS 8 PROCESSORS 2)
diff --git a/src/kudu/tablet/tablet_replica-test-base.cc
b/src/kudu/tablet/tablet_replica-test-base.cc
index e6e6dc3..4cac790 100644
--- a/src/kudu/tablet/tablet_replica-test-base.cc
+++ b/src/kudu/tablet/tablet_replica-test-base.cc
@@ -165,25 +165,25 @@ Status TabletReplicaTestBase::RestartReplica() {
tablet_replica_->SetBootstrapping();
RETURN_NOT_OK(BootstrapTablet(tablet_replica_->tablet_metadata(),
- cmeta->CommittedConfig(),
- clock(),
- /*mem_tracker*/nullptr,
- /*result_tracker*/nullptr,
- &metric_registry_,
- /*file_cache*/nullptr,
- tablet_replica_,
- tablet_replica_->log_anchor_registry(),
- &tablet,
- &log,
- &bootstrap_info));
+ cmeta->CommittedConfig(),
+ clock(),
+ /*mem_tracker*/nullptr,
+ /*result_tracker*/nullptr,
+ &metric_registry_,
+ /*file_cache*/nullptr,
+ tablet_replica_,
+ tablet_replica_->log_anchor_registry(),
+ &tablet,
+ &log,
+ &bootstrap_info));
RETURN_NOT_OK(tablet_replica_->Start(bootstrap_info,
- tablet,
- clock(),
- messenger_,
- scoped_refptr<ResultTracker>(),
- log,
- prepare_pool_.get(),
- dns_resolver_.get()));
+ tablet,
+ clock(),
+ messenger_,
+ scoped_refptr<ResultTracker>(),
+ log,
+ prepare_pool_.get(),
+ dns_resolver_.get()));
// Wait for the replica to be usable.
return
tablet_replica_->consensus()->WaitUntilLeaderForTests(kLeadershipTimeout);
}
