Alexey Serbin has submitted this change and it was merged. (
http://gerrit.cloudera.org:8080/15261 )
Change subject: [master] call Shutdown() in destructor
......................................................................
[master] call Shutdown() in destructor
Master was reported crashing in tests with stack like below when
catalog manager failed to initialize:
F0220 11:54:37.240003 1700 master.cc:128] Check failed: kRunning != state_
(2 vs. 2)
*** Check failure stack trace: ***
@ 0x7ff77ba68202 google::LogMessage::Flush()
@ 0x7ff77ba6c93b google::LogMessageFatal::~LogMessageFatal()
@ 0x7ff7876ed9ac kudu::master::Master::~Master()
@ 0x7ff78770f797 kudu::master::RunMasterServer()
@ 0x4dd00f kudu::master::MasterMain()
I took a quick look into the code and if my understanding is correct,
nothing prevents us calling Shutdown() in destructor, like TabletServer
does.
This patch updates Master's destructor to call Shutdown() to avoid
unneeded crashes like above and unify the behavior of Master and
TabletServer objects.
I also did cosmetic updates to the code to squelch cland-tidy warnings.
Change-Id: Icc3c5d0b183175ec6a5f288a30fb8a24bd983962
Reviewed-on: http://gerrit.cloudera.org:8080/15261
Reviewed-by: Adar Dembo <[email protected]>
Tested-by: Kudu Jenkins
---
M src/kudu/kserver/kserver.h
M src/kudu/master/master.cc
M src/kudu/master/master.h
M src/kudu/server/server_base.cc
M src/kudu/server/server_base.h
M src/kudu/tserver/tablet_server.cc
M src/kudu/tserver/tablet_server.h
7 files changed, 89 insertions(+), 69 deletions(-)
Approvals:
Adar Dembo: Looks good to me, approved
Kudu Jenkins: Verified
--
To view, visit http://gerrit.cloudera.org:8080/15261
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: kudu
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc3c5d0b183175ec6a5f288a30fb8a24bd983962
Gerrit-Change-Number: 15261
Gerrit-PatchSet: 3
Gerrit-Owner: Alexey Serbin <[email protected]>
Gerrit-Reviewer: Adar Dembo <[email protected]>
Gerrit-Reviewer: Alexey Serbin <[email protected]>
Gerrit-Reviewer: Grant Henke <[email protected]>
Gerrit-Reviewer: Kudu Jenkins (120)
Gerrit-Reviewer: Tidy Bot (241)
Gerrit-Reviewer: Volodymyr Verovkin <[email protected]>
