extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-11-25 09:54:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

replication: more elaborate messages for Conflict errors

Browse Source
This commit is contained in:
Christian Schwarz 2019-03-13 18:43:19 +01:00
parent d5250bbf51
commit edcd258cc9
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
replication/logic/diff/diff.go
View File

@ -1,7 +1,9 @@
package diff package diff
import ( import (
"fmt"
"sort" "sort"
"strings"
. "github.com/zrepl/zrepl/replication/logic/pdu" . "github.com/zrepl/zrepl/replication/logic/pdu"
) )
@ -11,7 +13,19 @@ type ConflictNoCommonAncestor struct {
} }
func (c *ConflictNoCommonAncestor) Error() string { func (c *ConflictNoCommonAncestor) Error() string {
return "no common snapshot or suitable bookmark between sender and receiver" var buf strings.Builder
buf.WriteString("no common snapshot or suitable bookmark between sender and receiver")
if len(c.SortedReceiverVersions) > 0 || len(c.SortedSenderVersions) > 0 {
buf.WriteString(":\n sorted sender versions:\n")
for _, v := range c.SortedSenderVersions {
fmt.Fprintf(&buf, " %s\n", v.RelName())
}
buf.WriteString(" sorted receiver versions:\n")
for _, v := range c.SortedReceiverVersions {
fmt.Fprintf(&buf, " %s\n", v.RelName())
}
}
return buf.String()
} }
type ConflictDiverged struct { type ConflictDiverged struct {
@ -21,7 +35,18 @@ type ConflictDiverged struct {
} }
func (c *ConflictDiverged) Error() string { func (c *ConflictDiverged) Error() string {
return "the receiver's latest snapshot is not present on sender" var buf strings.Builder
buf.WriteString("the receiver's latest snapshot is not present on sender:\n")
fmt.Fprintf(&buf, " last common: %s\n", c.CommonAncestor.RelName())
fmt.Fprintf(&buf, " sender-only:\n")
for _, v := range c.SenderOnly {
fmt.Fprintf(&buf, " %s\n", v.RelName())
}
fmt.Fprintf(&buf, " receiver-only:\n")
for _, v := range c.ReceiverOnly {
fmt.Fprintf(&buf, " %s\n", v.RelName())
}
return buf.String()
} }
func SortVersionListByCreateTXGThenBookmarkLTSnapshot(fsvslice []*FilesystemVersion) []*FilesystemVersion { func SortVersionListByCreateTXGThenBookmarkLTSnapshot(fsvslice []*FilesystemVersion) []*FilesystemVersion {