Skip to content

Added aborted parameter for set_position() method #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added aborted parameter for set_position() method #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dbsim/db_server_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ wsrep::gtid db::server_service::get_position(wsrep::client_service&)
}

void db::server_service::set_position(wsrep::client_service&,
const wsrep::gtid& gtid)
const wsrep::gtid& gtid,
bool)
{
return server_.storage_engine().store_position(gtid);
}
Expand Down
2 changes: 1 addition & 1 deletion dbsim/db_server_service.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ namespace db
wsrep::view get_view(wsrep::client_service&, const wsrep::id&)
override;
wsrep::gtid get_position(wsrep::client_service&) override;
void set_position(wsrep::client_service&, const wsrep::gtid&) override;
void set_position(wsrep::client_service&, const wsrep::gtid&, bool) override;
void log_state_change(enum wsrep::server_state::state,
enum wsrep::server_state::state) override;
int wait_committing_transactions(int) override;
Expand Down
3 changes: 2 additions & 1 deletion include/wsrep/server_service.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ namespace wsrep
*/
virtual void set_position(
wsrep::client_service& client_service,
const wsrep::gtid& gtid) = 0;
const wsrep::gtid& gtid,
bool aborted) = 0;

/**
* Log a state change event.
Expand Down
3 changes: 2 additions & 1 deletion src/transaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,8 @@ int wsrep::transaction::release_commit_order(
lock.lock();
if (!ret)
{
server_service_.set_position(client_service_, ws_meta_.gtid());
server_service_.set_position(client_service_, ws_meta_.gtid(),
(state() == s_aborted));
ret = provider().commit_order_leave(ws_handle_, ws_meta_,
apply_error_buf_);
}
Expand Down
3 changes: 2 additions & 1 deletion test/mock_server_state.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ namespace wsrep
}

void set_position(wsrep::client_service&,
const wsrep::gtid& gtid) WSREP_OVERRIDE
const wsrep::gtid& gtid,
bool) WSREP_OVERRIDE
{
position_ = gtid;
}
Expand Down