try fix invalid queu start if empty queue

absolute8511 · Feb 22, 2019 · 76b9b9d · 76b9b9d
1 parent 993db77
commit 76b9b9d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/nsqd/diskqueue_writer.go b/nsqd/diskqueue_writer.go
@@ -122,7 +122,13 @@ func newDiskQueueWriter(name string, dataPath string, maxBytesPerFile int64,
 		if d.diskQueueStart.EndOffset.GreatThan(&d.diskWriteEnd.EndOffset) ||
 			d.diskQueueStart.Offset() > d.diskWriteEnd.Offset() {
 			nsqLog.LogErrorf("diskqueue(%s) queue start invalid: %v", d.name, d.diskQueueStart)
-			return &d, ErrNeedFixQueueStart
+			if d.diskWriteEnd.EndOffset.FileNum == 0 &&
+				d.diskWriteEnd.EndOffset.Pos == 0 {
+				// auto fix this case
+				d.diskQueueStart.EndOffset = d.diskWriteEnd.EndOffset
+			} else {
+				return &d, ErrNeedFixQueueStart
+			}
 		}
 		d.saveExtraMeta()
 	}