Skip to content

Commit 705cd45

Browse files
committed
Fix awaitSchemaAgreement bug with not reporting error
1 parent 200dcd1 commit 705cd45

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

conn.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1900,6 +1900,7 @@ func (c *Conn) awaitSchemaAgreement(ctx context.Context) (err error) {
19001900

19011901
var versions map[string]struct{}
19021902
var schemaVersion string
1903+
var rows []map[string]interface{}
19031904

19041905
endDeadline := time.Now().Add(c.session.cfg.MaxWaitSchemaAgreement)
19051906

@@ -1908,17 +1909,18 @@ func (c *Conn) awaitSchemaAgreement(ctx context.Context) (err error) {
19081909

19091910
versions = make(map[string]struct{})
19101911

1911-
rows, err := iter.SliceMap()
1912+
rows, err = iter.SliceMap()
19121913
if err != nil {
19131914
goto cont
19141915
}
19151916

19161917
for _, row := range rows {
1917-
h, err := NewHostInfo(c.host.ConnectAddress(), c.session.cfg.Port)
1918+
var host *HostInfo
1919+
host, err = NewHostInfo(c.host.ConnectAddress(), c.session.cfg.Port)
19181920
if err != nil {
19191921
goto cont
19201922
}
1921-
host, err := c.session.hostInfoFromMap(row, h)
1923+
host, err = c.session.hostInfoFromMap(row, host)
19221924
if err != nil {
19231925
goto cont
19241926
}

0 commit comments

Comments
 (0)