Cleanup
parent
0e0050db9e
commit
9fc5029a33
|
@ -4,6 +4,9 @@ An in-process, in-memory database for Go.
|
||||||
|
|
||||||
## TO DO
|
## TO DO
|
||||||
|
|
||||||
|
* [ ] wal: shipping_test: secondary too far behind
|
||||||
|
* [ ] wal: writer_test: call RecvWAL twice
|
||||||
|
* [ ] wal: writer_test double start / stop
|
||||||
* [ ] kvstore: tests
|
* [ ] kvstore: tests
|
||||||
* [ ] wal: writer lock via flock?
|
* [ ] wal: writer lock via flock?
|
||||||
|
|
||||||
|
|
|
@ -138,6 +138,8 @@ func (w *Writer) RecvWAL(conn net.Conn) {
|
||||||
}
|
}
|
||||||
defer w.recvLock.Unlock()
|
defer w.recvLock.Unlock()
|
||||||
|
|
||||||
|
timeout := 16 * time.Second
|
||||||
|
|
||||||
headerBuf := make([]byte, recHeaderSize)
|
headerBuf := make([]byte, recHeaderSize)
|
||||||
buf := make([]byte, 8)
|
buf := make([]byte, 8)
|
||||||
|
|
||||||
|
@ -145,7 +147,7 @@ func (w *Writer) RecvWAL(conn net.Conn) {
|
||||||
expectedSeqNum := afterSeqNum + 1
|
expectedSeqNum := afterSeqNum + 1
|
||||||
|
|
||||||
// Send fromID to the conn.
|
// Send fromID to the conn.
|
||||||
conn.SetWriteDeadline(time.Now().Add(time.Minute))
|
conn.SetWriteDeadline(time.Now().Add(timeout))
|
||||||
binary.LittleEndian.PutUint64(buf, afterSeqNum)
|
binary.LittleEndian.PutUint64(buf, afterSeqNum)
|
||||||
if _, err := conn.Write(buf); err != nil {
|
if _, err := conn.Write(buf); err != nil {
|
||||||
log.Printf("RecvWAL failed to send after sequence number: %v", err)
|
log.Printf("RecvWAL failed to send after sequence number: %v", err)
|
||||||
|
@ -158,7 +160,7 @@ func (w *Writer) RecvWAL(conn net.Conn) {
|
||||||
defer w.stop()
|
defer w.stop()
|
||||||
|
|
||||||
for {
|
for {
|
||||||
conn.SetReadDeadline(time.Now().Add(time.Minute))
|
conn.SetReadDeadline(time.Now().Add(timeout))
|
||||||
if _, err := conn.Read(headerBuf); err != nil {
|
if _, err := conn.Read(headerBuf); err != nil {
|
||||||
log.Printf("RecvWAL failed to read header: %v", err)
|
log.Printf("RecvWAL failed to read header: %v", err)
|
||||||
return
|
return
|
||||||
|
|
Reference in New Issue