Skip to content

Include ServerError in downgrade criteria from peers_v2 to peers #1085

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

Merged
tolbertam merged 3 commits into from
Aug 20, 2018
Merged

Include ServerError in downgrade criteria from peers_v2 to peers #1085

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2a7f7a
Include ServerError in downgrade criteria from peers_v2 to peers
tolbertam Aug 20, 2018
3d4ae38
[fixup] Also check that message contains specific error
tolbertam Aug 20, 2018
078a7fa
[fixup] update comment
tolbertam Aug 20, 2018
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
11 changes: 8 additions & 3 deletions driver-core/src/main/java/com/datastax/driver/core/ControlConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.datastax.driver.core.exceptions.DriverInternalError;
import com.datastax.driver.core.exceptions.InvalidQueryException;
import com.datastax.driver.core.exceptions.NoHostAvailableException;
import com.datastax.driver.core.exceptions.ServerError;
import com.datastax.driver.core.exceptions.UnsupportedProtocolVersionException;
import com.datastax.driver.core.utils.MoreFutures;
import com.datastax.driver.core.utils.MoreObjects;
Expand Down Expand Up @@ -707,9 +708,13 @@ public void onSuccess(ResultSet result) {

@Override
public void onFailure(Throwable t) {
// downgrade to system.peers if we get an invalid query as this indicates
// the peers_v2 table does not exist.
if (t instanceof InvalidQueryException) {
// Downgrade to system.peers if we get an invalid query error as this indicates the
// peers_v2 table does not exist.
// Also downgrade on server error with a specific error message (DSE 6.0.0 to 6.0.2
// with search enabled.
if (t instanceof InvalidQueryException
|| (t instanceof ServerError
&& t.getMessage().contains("Unknown keyspace/cf pair (system.peers_v2)"))) {
isPeersV2 = false;
MoreFutures.propagateFuture(peersFuture, selectPeersFuture(connection));
} else {
Expand Down