Skip to content
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

Jump to bottom

CPP-953 Naive attempt to avoid pure virtual function calls at cluster shutdown #524

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CPP-953 Naive attempt to avoid pure virtual function calls at cluster shutdown #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
199b395
Attempt to avoid entangling PrepareHostHandler and Cluster by avoidin…
absurdfarce Mar 7, 2022
f60fdbd
Minor integration test fix
absurdfarce Mar 8, 2022
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
2 changes: 0 additions & 2 deletions src/prepare_host_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ void PrepareHostHandler::prepare(uv_loop_t* loop, const ConnectionSettings& sett
}

void PrepareHostHandler::on_close(Connection* connection) {
callback_(this);

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mpenick What do you think of this idea? The callback here is Cluster::on_prepare_host_up and it doesn't look like there's any benefit to calling it when we're shutting down the cluster anyway. And if we don't call it we should avoid tangling up Cluster and PrepareHostHandler method calls... which should remove the possibility of a pure virtual function call.

Does this make sense or am I missing something?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is going after the symptom instead of fixing the cause. My bet is the listener which is SessionBase is being freed before the the Cluster object is finished with it.

dec_ref(); // The event loop is done with this handler
}

Expand Down
8 changes: 4 additions & 4 deletions tests/src/integration/tests/test_prepare_on.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ CASSANDRA_INTEGRATION_TEST_F(PrepareOnUpAndAddTests, NotPreparedOnUpWhenDisabled

// Wait for the node to become available and verify no statements have been
// prepared
wait_for_node_on_session(session, 1);
wait_for_node_on_session(session_for_node(1), 1);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor test change. wait_for_node_on_session() is querying system.local so to get a robust comparison we should always use a clean session, especially after bootstrapping a new node. I was seeing these tests fail due to a belief that the node was unavailable; after digging in it looked as if the session was simply querying the wrong node.

prepared_statements_are_not_present(1);
}

Expand Down Expand Up @@ -404,7 +404,7 @@ CASSANDRA_INTEGRATION_TEST_F(PrepareOnUpAndAddTests, PreparedOnUpWhenEnabled) {

// Wait for the node to become available and verify that the statements
// in the prepared metadata cache have been prepared
wait_for_node_on_session(session, 1);
wait_for_node_on_session(session_for_node(1), 1);
prepared_statements_are_present(1);
}

Expand Down Expand Up @@ -435,7 +435,7 @@ CASSANDRA_INTEGRATION_TEST_F(PrepareOnUpAndAddTests, NotPreparedOnAddWhenDisable

// Wait for the new node to become available and verify no statements have
// been prepared
wait_for_node_on_session(session, node);
wait_for_node_on_session(session_for_node(node), node);
prepared_statements_are_not_present(node);
}

Expand Down Expand Up @@ -466,6 +466,6 @@ CASSANDRA_INTEGRATION_TEST_F(PrepareOnUpAndAddTests, PreparedOnAddWhenEnabled) {

// Wait for the new node to become available and verify that the statements
// in the prepared metadata cache have been prepared
wait_for_node_on_session(session, node);
wait_for_node_on_session(session_for_node(node), node);
prepared_statements_are_present(node);
}