Stop a clean migration reporting domains it never lost
The post-migration comparison had the two versions counting domains differently, and yesterday's wiring turned that into a gate: `run` would have failed a migration that lost nothing. The 0.15 side added every domain appearing in any account's address on top of the domain principals - the fallback's own comment says "if the instance has no explicit domain principals", but the loop ran unconditionally. The 0.16 side did the reverse, listing only domains some account calls its primary, discarding the full Domain list it had already fetched. An instance with three declared domains and accounts aliased across nine reported nine before and three after. INBUXA is exactly that shape, and this was the account/domain over-count noted as undiagnosed. Both sides now mean "the domains this server holds". A domain that still goes missing is reported as a warning rather than failing the run: what the two versions call a domain differs across this boundary in ways we have now been caught by once, and a missing account - which is compared with a local-part fallback and is what actually matters - still fails. Narrowing OK() also made String() return before printing the domain lines, so the new warning would have been silent. Caught by its own test.
This commit is contained in:
@@ -185,14 +185,22 @@ func (c *Client) accountSnapshotJMAP(ctx context.Context) (*Snapshot, error) {
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("stalwartapi: resolve domain names (an unresolved id would make every domain look missing): %w", err)
|
||||
}
|
||||
// Every domain the server holds, not only those some account calls its
|
||||
// primary. Deriving the list from accounts dropped alias domains and
|
||||
// domains with no accounts, so comparing it against a "before" list
|
||||
// that did include them reported losses that had not happened.
|
||||
domainSet := map[string]bool{}
|
||||
for _, name := range domainNames {
|
||||
if name != "" {
|
||||
domainSet[name] = true
|
||||
}
|
||||
}
|
||||
for _, a := range accounts {
|
||||
if a.DomainID == "" {
|
||||
continue
|
||||
}
|
||||
if name, ok := domainNames[a.DomainID]; ok && name != "" {
|
||||
domainSet[name] = true
|
||||
continue
|
||||
continue // already counted above
|
||||
}
|
||||
// Keep the raw id rather than dropping the domain entirely: a
|
||||
// domain that can't be named is still a domain that exists.
|
||||
|
||||
Reference in New Issue
Block a user