Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: scylladb/java-driver
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6134b174efcf44f7f607daa22878850baf2934f4
Choose a base ref
..
head repository: scylladb/java-driver
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f838d27f3fa28de95397dcc51f6e457c6cb6c87a
Choose a head ref
Showing with 13 additions and 2 deletions.
  1. +13 −2 driver-core/src/main/java/com/datastax/driver/core/RequestHandler.java
15 changes: 13 additions & 2 deletions driver-core/src/main/java/com/datastax/driver/core/RequestHandler.java
View file
Original file line number Diff line number Diff line change
@@ -371,6 +371,8 @@ private void setFinalResult(
System.nanoTime() - startTime, /*unused*/
0);

tracingInfo.recordException(e);
tracingInfo.setStatus(TracingInfo.StatusCode.ERROR, e.toString());
tracingInfo.recordException(e);
tracingInfo.setStatus(TracingInfo.StatusCode.ERROR, e.toString());
tracingInfo.tracingFinished();
@@ -413,6 +415,7 @@ private void setFinalException(
// This is only a failure if there are no other running executions.
private void reportNoMoreHosts(SpeculativeExecution execution) {
execution.parentTracingInfo.setRetryCount(execution.retryCount());
execution.parentTracingInfo.setStatus(TracingInfo.StatusCode.ERROR);
execution.parentTracingInfo.tracingFinished();
runningExecutions.remove(execution);
if (runningExecutions.isEmpty())
@@ -492,7 +495,7 @@ class SpeculativeExecution implements Connection.ResponseCallback {
this.queryStateRef = new AtomicReference<QueryState>(QueryState.INITIAL);
this.parentTracingInfo =
manager.getTracingInfoFactory().buildTracingInfo(RequestHandler.this.tracingInfo);
this.parentTracingInfo.setNameAndStartTime("speculative_execution." + position);
this.parentTracingInfo.setNameAndStartTime("speculative_execution");
if (logger.isTraceEnabled()) logger.trace("[{}] Starting", id);
}

@@ -535,7 +538,7 @@ private boolean query(final Host host) {
if (logger.isTraceEnabled()) logger.trace("[{}] Querying node {}", id, host);

currentChildTracingInfo = manager.getTracingInfoFactory().buildTracingInfo(parentTracingInfo);
currentChildTracingInfo.setNameAndStartTime("query");
currentChildTracingInfo.setNameAndStartTime("attempt");
InetSocketAddress hostAddress = host.getEndPoint().resolve();
currentChildTracingInfo.setPeerName(hostAddress.getHostName());
currentChildTracingInfo.setPeerIP(hostAddress.getAddress());
@@ -760,6 +763,7 @@ void cancel() {
System.nanoTime() - startTime);
}
parentTracingInfo.setRetryCount(retryCount());
parentTracingInfo.setStatus(TracingInfo.StatusCode.OK);
parentTracingInfo.tracingFinished();
return;
} else if (!previous.inProgress
@@ -774,6 +778,7 @@ void cancel() {
System.nanoTime() - startTime);
}
parentTracingInfo.setRetryCount(retryCount());
parentTracingInfo.setStatus(TracingInfo.StatusCode.OK);
parentTracingInfo.tracingFinished();
return;
}
@@ -791,6 +796,7 @@ public Message.Request request() {
public void onSet(
Connection connection, Message.Response response, long latency, int retryCount) {
currentChildTracingInfo.setShardID(connection.shardId());
currentChildTracingInfo.setStatus(TracingInfo.StatusCode.OK);
currentChildTracingInfo.tracingFinished();

QueryState queryState = queryStateRef.get();
@@ -1102,6 +1108,8 @@ public boolean onTimeout(Connection connection, long latency, int retryCount) {
public void onException(
Connection connection, Exception exception, long latency, int retryCount) {
currentChildTracingInfo.setShardID(connection.shardId());
currentChildTracingInfo.recordException(exception);
currentChildTracingInfo.setStatus(TracingInfo.StatusCode.ERROR);
currentChildTracingInfo.tracingFinished();

QueryState queryState = queryStateRef.get();
@@ -1142,6 +1150,7 @@ public void onException(
@Override
public boolean onTimeout(Connection connection, long latency, int retryCount) {
currentChildTracingInfo.setShardID(connection.shardId());
currentChildTracingInfo.setStatus(TracingInfo.StatusCode.ERROR, "timeout");
currentChildTracingInfo.tracingFinished();

QueryState queryState = queryStateRef.get();
@@ -1186,12 +1195,14 @@ public int retryCount() {

private void setFinalException(Connection connection, Exception exception) {
parentTracingInfo.setRetryCount(retryCount());
parentTracingInfo.setStatus(TracingInfo.StatusCode.ERROR);
parentTracingInfo.tracingFinished();
RequestHandler.this.setFinalException(this, connection, exception);
}

private void setFinalResult(Connection connection, Message.Response response) {
parentTracingInfo.setRetryCount(retryCount());
parentTracingInfo.setStatus(TracingInfo.StatusCode.OK);
parentTracingInfo.tracingFinished();
RequestHandler.this.setFinalResult(this, connection, response);
}