Skip to content

Commit e42f913

Browse files
committed
Fix awaitSchemaAgreement bug with not reporting error
1 parent d5c5513 commit e42f913

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
@@ -1943,6 +1943,7 @@ func (c *Conn) awaitSchemaAgreement(ctx context.Context) (err error) {
19431943

19441944
var versions map[string]struct{}
19451945
var schemaVersion string
1946+
var rows []map[string]interface{}
19461947

19471948
endDeadline := time.Now().Add(c.session.cfg.MaxWaitSchemaAgreement)
19481949

@@ -1951,17 +1952,18 @@ func (c *Conn) awaitSchemaAgreement(ctx context.Context) (err error) {
19511952

19521953
versions = make(map[string]struct{})
19531954

1954-
rows, err := iter.SliceMap()
1955+
rows, err = iter.SliceMap()
19551956
if err != nil {
19561957
goto cont
19571958
}
19581959

19591960
for _, row := range rows {
1960-
h, err := NewHostInfo(c.host.ConnectAddress(), c.session.cfg.Port)
1961+
var host *HostInfo
1962+
host, err = NewHostInfo(c.host.ConnectAddress(), c.session.cfg.Port)
19611963
if err != nil {
19621964
goto cont
19631965
}
1964-
host, err := c.session.hostInfoFromMap(row, h)
1966+
host, err = c.session.hostInfoFromMap(row, host)
19651967
if err != nil {
19661968
goto cont
19671969
}

0 commit comments

Comments
 (0)