Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Improve error reporting for tell-based reads
[controller.git]
/
opendaylight
/
md-sal
/
cds-access-client
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
access
/
client
/
AbstractClientConnection.java
diff --git
a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnection.java
b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnection.java
index 7375fe06d95f3986860755b5066eb47f4e6bff8d..c32f7b2532cbe2d259357f5219b15835f941096a 100644
(file)
--- a/
opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnection.java
+++ b/
opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnection.java
@@
-78,6
+78,7
@@
public abstract class AbstractClientConnection<T extends BackendInfo> {
@GuardedBy("lock")
private final TransmitQueue queue;
private final Long cookie;
@GuardedBy("lock")
private final TransmitQueue queue;
private final Long cookie;
+ private final String backendName;
@GuardedBy("lock")
private boolean haveTimer;
@GuardedBy("lock")
private boolean haveTimer;
@@
-90,9
+91,11
@@
public abstract class AbstractClientConnection<T extends BackendInfo> {
private volatile RequestException poisoned;
// Private constructor to avoid code duplication.
private volatile RequestException poisoned;
// Private constructor to avoid code duplication.
- private AbstractClientConnection(final AbstractClientConnection<T> oldConn, final TransmitQueue newQueue) {
+ private AbstractClientConnection(final AbstractClientConnection<T> oldConn, final TransmitQueue newQueue,
+ final String backendName) {
this.context = Preconditions.checkNotNull(oldConn.context);
this.cookie = Preconditions.checkNotNull(oldConn.cookie);
this.context = Preconditions.checkNotNull(oldConn.context);
this.cookie = Preconditions.checkNotNull(oldConn.cookie);
+ this.backendName = Preconditions.checkNotNull(backendName);
this.queue = Preconditions.checkNotNull(newQueue);
// Will be updated in finishReplay if needed.
this.lastReceivedTicks = oldConn.lastReceivedTicks;
this.queue = Preconditions.checkNotNull(newQueue);
// Will be updated in finishReplay if needed.
this.lastReceivedTicks = oldConn.lastReceivedTicks;
@@
-100,9
+103,11
@@
public abstract class AbstractClientConnection<T extends BackendInfo> {
// This constructor is only to be called by ConnectingClientConnection constructor.
// Do not allow subclassing outside of this package
// This constructor is only to be called by ConnectingClientConnection constructor.
// Do not allow subclassing outside of this package
- AbstractClientConnection(final ClientActorContext context, final Long cookie, final int queueDepth) {
+ AbstractClientConnection(final ClientActorContext context, final Long cookie, final String backendName,
+ final int queueDepth) {
this.context = Preconditions.checkNotNull(context);
this.cookie = Preconditions.checkNotNull(cookie);
this.context = Preconditions.checkNotNull(context);
this.cookie = Preconditions.checkNotNull(cookie);
+ this.backendName = Preconditions.checkNotNull(backendName);
this.queue = new TransmitQueue.Halted(queueDepth);
this.lastReceivedTicks = currentTime();
}
this.queue = new TransmitQueue.Halted(queueDepth);
this.lastReceivedTicks = currentTime();
}
@@
-110,14
+115,15
@@
public abstract class AbstractClientConnection<T extends BackendInfo> {
// This constructor is only to be called (indirectly) by ReconnectingClientConnection constructor.
// Do not allow subclassing outside of this package
AbstractClientConnection(final AbstractClientConnection<T> oldConn) {
// This constructor is only to be called (indirectly) by ReconnectingClientConnection constructor.
// Do not allow subclassing outside of this package
AbstractClientConnection(final AbstractClientConnection<T> oldConn) {
- this(oldConn, new TransmitQueue.Halted(oldConn.queue, oldConn.currentTime()));
+ this(oldConn, new TransmitQueue.Halted(oldConn.queue, oldConn.currentTime())
, oldConn.backendName
);
}
// This constructor is only to be called (indirectly) by ConnectedClientConnection constructor.
// Do not allow subclassing outside of this package
}
// This constructor is only to be called (indirectly) by ConnectedClientConnection constructor.
// Do not allow subclassing outside of this package
- AbstractClientConnection(final AbstractClientConnection<T> oldConn, final T newBackend, final int queueDepth) {
+ AbstractClientConnection(final AbstractClientConnection<T> oldConn, final T newBackend,
+ final int queueDepth) {
this(oldConn, new TransmitQueue.Transmitting(oldConn.queue, queueDepth, newBackend, oldConn.currentTime(),
this(oldConn, new TransmitQueue.Transmitting(oldConn.queue, queueDepth, newBackend, oldConn.currentTime(),
- Preconditions.checkNotNull(oldConn.context).messageSlicer()));
+ Preconditions.checkNotNull(oldConn.context).messageSlicer())
, newBackend.getName()
);
}
public final ClientActorContext context() {
}
public final ClientActorContext context() {
@@
-422,7
+428,8
@@
public abstract class AbstractClientConnection<T extends BackendInfo> {
context.executeInActor(current -> {
final double time = beenOpen * 1.0 / 1_000_000_000;
entry.complete(entry.getRequest().toRequestFailure(
context.executeInActor(current -> {
final double time = beenOpen * 1.0 / 1_000_000_000;
entry.complete(entry.getRequest().toRequestFailure(
- new RequestTimeoutException(entry.getRequest() + " timed out after " + time + " seconds")));
+ new RequestTimeoutException(entry.getRequest() + " timed out after " + time
+ + " seconds. The backend for " + backendName + " is not available.")));
return current;
});
}
return current;
});
}