Skip to content

Commit 5ef5bec

Browse files
author
Leandro Pacheco
committed
removing previous_primary_view from public iface and style fixes
1 parent 71f3fb2 commit 5ef5bec

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

include/wsrep/server_state.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,6 @@ namespace wsrep
355355
* Return current view
356356
*/
357357
const wsrep::view& current_view() const { return current_view_; }
358-
/**
359-
* Return the previous primary view
360-
*/
361-
const wsrep::view& previous_primary_view() const { return previous_primary_view_; }
362358
/**
363359
* Set last committed GTID.
364360
*/

src/server_state.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,8 @@ void wsrep::server_state::sst_received(wsrep::client_service& cs,
612612
throw wsrep::runtime_error(msg.str());
613613
}
614614

615-
if (current_view_.status() == wsrep::view::primary) {
615+
if (current_view_.status() == wsrep::view::primary)
616+
{
616617
previous_primary_view_ = current_view_;
617618
}
618619
current_view_ = v;
@@ -901,7 +902,8 @@ void wsrep::server_state::on_view(const wsrep::view& view,
901902
<< "name: " << i->name();
902903
}
903904
wsrep::log_info() << "=================================================";
904-
if (current_view_.status() == wsrep::view::primary) {
905+
if (current_view_.status() == wsrep::view::primary)
906+
{
905907
previous_primary_view_ = current_view_;
906908
}
907909
current_view_ = view;

0 commit comments

Comments
 (0)