Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(679)

Unified Diff: logdog/server/archivist/archivist.go

Issue 2435883002: LogDog: Fix archival Get/Tail implementations. (Closed)
Patch Set: LogDog: Fix archival Get/Tail implementations. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: logdog/server/archivist/archivist.go
diff --git a/logdog/server/archivist/archivist.go b/logdog/server/archivist/archivist.go
index 8a297d57582ff3071d83a87ea528cd8d53b3743b..5fb9d7ba1773ca0ff1a02d95938e0005cdea09c1 100644
--- a/logdog/server/archivist/archivist.go
+++ b/logdog/server/archivist/archivist.go
@@ -533,7 +533,13 @@ func (sa *stagedArchival) checkComplete(c context.Context) error {
nextIndex := types.MessageIndex(0)
var ierr error
- err := sa.Storage.Get(sreq, func(idx types.MessageIndex, d []byte) bool {
+ err := sa.Storage.Get(sreq, func(e *storage.Entry) bool {
+ idx, err := e.GetStreamIndex()
+ if err != nil {
+ ierr = errors.Annotate(err).Reason("could not get stream index").Err()
+ return false
+ }
+
switch {
case idx != nextIndex:
ierr = fmt.Errorf("missing log entry index %d (next %d)", nextIndex, idx)

Powered by Google App Engine
This is Rietveld 408576698