Skip to content

Commit ae746fb

Browse files
author
Leandro Pacheco
committed
fixing reviewer comments
- style fixes - small improvement to avoid unnecessary search on close_orphaned_sr
1 parent 5ef5bec commit ae746fb

File tree

4 files changed

+37
-47
lines changed

4 files changed

+37
-47
lines changed

include/wsrep/server_state.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ namespace wsrep
355355
* Return current view
356356
*/
357357
const wsrep::view& current_view() const { return current_view_; }
358+
358359
/**
359360
* Set last committed GTID.
360361
*/

src/server_state.cpp

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -887,21 +887,8 @@ void wsrep::server_state::on_view(const wsrep::view& view,
887887
{
888888
wsrep::log_info()
889889
<< "================================================\nView:\n"
890-
<< " id: " << view.state_id() << "\n"
891-
<< " seqno: " << view.view_seqno() << "\n"
892-
<< " status: " << view.status() << "\n"
893-
<< " protocol_version: " << view.protocol_version() << "\n"
894-
<< " own_index: " << view.own_index() << "\n"
895-
<< " final: " << view.final() << "\n"
896-
<< " members";
897-
const std::vector<wsrep::view::member>& members(view.members());
898-
for (std::vector<wsrep::view::member>::const_iterator i(members.begin());
899-
i != members.end(); ++i)
900-
{
901-
wsrep::log_info() << " id: " << i->id() << " "
902-
<< "name: " << i->name();
903-
}
904-
wsrep::log_info() << "=================================================";
890+
<< view
891+
<< "=================================================";
905892
if (current_view_.status() == wsrep::view::primary)
906893
{
907894
previous_primary_view_ = current_view_;
@@ -1309,12 +1296,13 @@ void wsrep::server_state::close_orphaned_sr_transactions(
13091296
streaming_appliers_map::iterator i(streaming_appliers_.begin());
13101297
while (i != streaming_appliers_.end())
13111298
{
1312-
bool origin_not_in_view = std::find_if(current_view_.members().begin(),
1313-
current_view_.members().end(),
1314-
server_id_cmp(i->first.first)) ==
1315-
current_view_.members().end();
1316-
1317-
if (origin_not_in_view || equal_consecutive_views)
1299+
// rollback SR on equal consecutive primary views or if its
1300+
// originator is not in the current view
1301+
if (equal_consecutive_views ||
1302+
(std::find_if(current_view_.members().begin(),
1303+
current_view_.members().end(),
1304+
server_id_cmp(i->first.first)) ==
1305+
current_view_.members().end()))
13181306
{
13191307
WSREP_LOG_DEBUG(wsrep::log::debug_log_level(),
13201308
wsrep::log::debug_level_server_state,

src/view.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ bool wsrep::view::equal_membership(const wsrep::view& other) const
4343
for (std::vector<member>::const_iterator i(members_.begin());
4444
i != members_.end(); ++i)
4545
{
46-
if (other.member_index(i->id()) == -1) {
46+
if (other.member_index(i->id()) == -1)
47+
{
4748
return false;
4849
}
4950
}
@@ -54,7 +55,7 @@ void wsrep::view::print(std::ostream& os) const
5455
{
5556
os << " id: " << state_id() << "\n"
5657
<< " status: " << to_c_string(status()) << "\n"
57-
<< " prococol_version: " << protocol_version() << "\n"
58+
<< " protocol_version: " << protocol_version() << "\n"
5859
<< " capabilities: " << provider::capability::str(capabilities())<<"\n"
5960
<< " final: " << (final() ? "yes" : "no") << "\n"
6061
<< " own_index: " << own_index() << "\n"

test/view_test.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ BOOST_AUTO_TEST_CASE(view_test_member_index)
2828
members.push_back(wsrep::view::member(wsrep::id("3"), "", ""));
2929

3030
wsrep::view view(wsrep::gtid(wsrep::id("cluster"), wsrep::seqno(1)),
31-
wsrep::seqno(1),
32-
wsrep::view::primary,
33-
0,
34-
1,
35-
0,
36-
members);
31+
wsrep::seqno(1),
32+
wsrep::view::primary,
33+
0,
34+
1,
35+
0,
36+
members);
3737
BOOST_REQUIRE(view.member_index(wsrep::id("1")) == 0);
3838
BOOST_REQUIRE(view.member_index(wsrep::id("2")) == 1);
3939
BOOST_REQUIRE(view.member_index(wsrep::id("3")) == 2);
@@ -59,28 +59,28 @@ BOOST_AUTO_TEST_CASE(view_test_equal_membership)
5959
m3.push_back(wsrep::view::member(wsrep::id("4"), "", ""));
6060

6161
wsrep::view v1(wsrep::gtid(wsrep::id("cluster"), wsrep::seqno(1)),
62-
wsrep::seqno(1),
63-
wsrep::view::primary,
64-
0,
65-
1,
66-
0,
67-
m1);
62+
wsrep::seqno(1),
63+
wsrep::view::primary,
64+
0,
65+
1,
66+
0,
67+
m1);
6868

6969
wsrep::view v2(wsrep::gtid(wsrep::id("cluster"), wsrep::seqno(1)),
70-
wsrep::seqno(1),
71-
wsrep::view::primary,
72-
0,
73-
1,
74-
0,
75-
m2);
70+
wsrep::seqno(1),
71+
wsrep::view::primary,
72+
0,
73+
1,
74+
0,
75+
m2);
7676

7777
wsrep::view v3(wsrep::gtid(wsrep::id("cluster"), wsrep::seqno(1)),
78-
wsrep::seqno(1),
79-
wsrep::view::primary,
80-
0,
81-
1,
82-
0,
83-
m3);
78+
wsrep::seqno(1),
79+
wsrep::view::primary,
80+
0,
81+
1,
82+
0,
83+
m3);
8484

8585
BOOST_REQUIRE(v1.equal_membership(v2));
8686
BOOST_REQUIRE(v2.equal_membership(v1));

0 commit comments

Comments
 (0)