Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move JournalWriter.getLastIndex()
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-segmented-journal
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
akka
/
segjournal
/
DataJournalV0.java
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 ad4c110bc893468e56159f52028a2bfa0cdd8df2..bf1700f7f04eb64dda6751e436068a662da4e097 100644
(file)
--- 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() {
@Override
long lastWrittenSequenceNr() {
- return entries.
writer().getL
astIndex();
+ return entries.
l
astIndex();
}
@Override
}
@Override
@@
-120,17
+120,18
@@
final class DataJournalV0 extends DataJournal {
long writtenBytes = 0;
for (int i = 0; i < count; ++i) {
long writtenBytes = 0;
for (int i = 0; i < count; ++i) {
- final long
mark = writer.getLas
tIndex();
+ final long
prevNextIndex = writer.getNex
tIndex();
final var request = message.getRequest(i);
final var reprs = CollectionConverters.asJava(request.payload());
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) {
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);
responses.add(e);
- writer.
truncate(mark
);
+ writer.
reset(prevNextIndex
);
continue;
}
responses.add(null);
continue;
}
responses.add(null);