[kudu] 01/03: consensus_peers-test: SIGSEGV in TearDown when SetUp fails

[ad...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

adar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git

commit f02bd5d423fce63a9288c97a58798829f52665c2
Author: Adar Dembo <ad...@cloudera.com>
AuthorDate: Tue Apr 23 21:39:15 2019 -0700

    consensus_peers-test: SIGSEGV in TearDown when SetUp fails
    
    Change-Id: I269ef42ebf4621c80b44391efabf9b6e96584294
    Reviewed-on: http://gerrit.cloudera.org:8080/13097
    Tested-by: Adar Dembo <ad...@cloudera.com>
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
    Reviewed-by: Grant Henke <gr...@apache.org>
---
 src/kudu/consensus/consensus_peers-test.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/kudu/consensus/consensus_peers-test.cc b/src/kudu/consensus/consensus_peers-test.cc
index 37427c6..73246f5 100644
--- a/src/kudu/consensus/consensus_peers-test.cc
+++ b/src/kudu/consensus/consensus_peers-test.cc
@@ -111,8 +111,12 @@ class ConsensusPeersTest : public KuduTest {
   }
 
   virtual void TearDown() OVERRIDE {
-    ASSERT_OK(log_->WaitUntilAllFlushed());
-    messenger_->Shutdown();
+    if (log_) {
+      ASSERT_OK(log_->WaitUntilAllFlushed());
+    }
+    if (messenger_) {
+      messenger_->Shutdown();
+    }
     if (raft_pool_) {
       // Make sure to drain any tasks from the pool we're using for our delayable
       // proxy before destructing the queue.