From 5ef5becea61e3475fd1cf638c1aa52385e0bc956 Mon Sep 17 00:00:00 2001 From: Leandro Pacheco Date: Tue, 5 Mar 2019 10:34:30 +0100 Subject: [PATCH] removing previous_primary_view from public iface and style fixes --- include/wsrep/server_state.hpp | 4 ---- src/server_state.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/wsrep/server_state.hpp b/include/wsrep/server_state.hpp index 7587dcb..4ddcce6 100644 --- a/include/wsrep/server_state.hpp +++ b/include/wsrep/server_state.hpp @@ -355,10 +355,6 @@ namespace wsrep * Return current view */ const wsrep::view& current_view() const { return current_view_; } - /** - * Return the previous primary view - */ - const wsrep::view& previous_primary_view() const { return previous_primary_view_; } /** * Set last committed GTID. */ diff --git a/src/server_state.cpp b/src/server_state.cpp index 508c05c..07b4118 100644 --- a/src/server_state.cpp +++ b/src/server_state.cpp @@ -612,7 +612,8 @@ void wsrep::server_state::sst_received(wsrep::client_service& cs, throw wsrep::runtime_error(msg.str()); } - if (current_view_.status() == wsrep::view::primary) { + if (current_view_.status() == wsrep::view::primary) + { previous_primary_view_ = current_view_; } current_view_ = v; @@ -901,7 +902,8 @@ void wsrep::server_state::on_view(const wsrep::view& view, << "name: " << i->name(); } wsrep::log_info() << "================================================="; - if (current_view_.status() == wsrep::view::primary) { + if (current_view_.status() == wsrep::view::primary) + { previous_primary_view_ = current_view_; } current_view_ = view;