X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-segmented-journal%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fakka%2Fsegjournal%2FDataJournalV0.java;fp=opendaylight%2Fmd-sal%2Fsal-akka-segmented-journal%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fakka%2Fsegjournal%2FDataJournalV0.java;h=bf1700f7f04eb64dda6751e436068a662da4e097;hb=794f28ea9f2c22dfb7042266b71ada659a920ab7;hp=ad4c110bc893468e56159f52028a2bfa0cdd8df2;hpb=08f3407005c878653d35d33bb28aca039ec60b0e;p=controller.git diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java index ad4c110bc8..bf1700f7f0 100644 --- a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java +++ b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java @@ -51,7 +51,7 @@ final class DataJournalV0 extends DataJournal { @Override long lastWrittenSequenceNr() { - return entries.writer().getLastIndex(); + return entries.lastIndex(); } @Override @@ -120,17 +120,18 @@ final class DataJournalV0 extends DataJournal { long writtenBytes = 0; for (int i = 0; i < count; ++i) { - final long mark = writer.getLastIndex(); + final long prevNextIndex = writer.getNextIndex(); final var request = message.getRequest(i); final var reprs = CollectionConverters.asJava(request.payload()); - LOG.trace("{}: append {}/{}: {} items at mark {}", persistenceId, i, count, reprs.size(), mark); + LOG.trace("{}: append {}/{}: {} items at mark {}", persistenceId, i, count, reprs.size(), prevNextIndex); try { writtenBytes += writePayload(writer, reprs); } catch (Exception e) { - LOG.warn("{}: failed to write out request {}/{} reverting to {}", persistenceId, i, count, mark, e); + LOG.warn("{}: failed to write out request {}/{} reverting to {}", persistenceId, i, count, + prevNextIndex, e); responses.add(e); - writer.truncate(mark); + writer.reset(prevNextIndex); continue; } responses.add(null);