From: Stephen Kitt <skitt@redhat.com>
Date: Thu, 28 Jun 2018 11:48:21 +0000 (+0200)
Subject: Trace the originating generation in RGE
X-Git-Tag: release/fluorine~64
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=9b235df8e0b4d8c4c7419419538188cdf7b2bfc2

Trace the originating generation in RGE

This adds the originating generation in RetiredGenerationException’s
message.

Change-Id: Ie4cb11a0cc151176d765fc6d200cd7dd295798e1
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RetiredGenerationException.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RetiredGenerationException.java
index 219f2819dc..7730318f57 100644
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RetiredGenerationException.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RetiredGenerationException.java
@@ -19,8 +19,9 @@ import com.google.common.annotations.Beta;
 public final class RetiredGenerationException extends RequestException {
     private static final long serialVersionUID = 1L;
 
-    public RetiredGenerationException(final long newGeneration) {
-        super("Originating generation was superseded by " + Long.toUnsignedString(newGeneration));
+    public RetiredGenerationException(final long originatingGeneration, final long newGeneration) {
+        super("Originating generation " + Long.toUnsignedString(originatingGeneration) + " was superseded by "
+            + Long.toUnsignedString(newGeneration));
     }
 
     @Override
diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RetiredGenerationExceptionTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RetiredGenerationExceptionTest.java
index 1d0f016ce7..778f2d7e59 100644
--- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RetiredGenerationExceptionTest.java
+++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RetiredGenerationExceptionTest.java
@@ -13,7 +13,7 @@ import static org.junit.Assert.assertTrue;
 
 public class RetiredGenerationExceptionTest extends RequestExceptionTest<RetiredGenerationException> {
 
-    private static final RequestException OBJECT = new RetiredGenerationException(100);
+    private static final RequestException OBJECT = new RetiredGenerationException(99, 100);
 
     @Override
     protected void isRetriable() {
@@ -23,7 +23,7 @@ public class RetiredGenerationExceptionTest extends RequestExceptionTest<Retired
     @Override
     protected void checkMessage() {
         final String message = OBJECT.getMessage();
-        assertTrue("Originating generation was superseded by 100".equals(message));
+        assertTrue("Originating generation 99 was superseded by 100".equals(message));
         assertNull(OBJECT.getCause());
     }
 }
diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
index c3cd8ef80f..7b1f9df12d 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
@@ -474,7 +474,8 @@ public class Shard extends RaftActor {
             }
             if (cmp > 0) {
                 LOG.debug("{}: rejecting request from outdated client {}", persistenceId(), clientId);
-                throw new RetiredGenerationException(existing.getIdentifier().getGeneration());
+                throw new RetiredGenerationException(clientId.getGeneration(),
+                    existing.getIdentifier().getGeneration());
             }
 
             LOG.info("{}: retiring state {}, outdated by request from client {}", persistenceId(), existing, clientId);