Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions flow/connectors/external_metadata/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,6 @@ func NewPostgresMetadataFromCatalog(logger log.Logger, pool shared.CatalogPool)
}
}

func (p *PostgresMetadata) Ping(ctx context.Context) error {
if err := p.pool.Ping(ctx); err != nil {
return fmt.Errorf("metadata db ping failed: %w", err)
}

return nil
}

func (p *PostgresMetadata) LogFlowInfo(ctx context.Context, flowName string, info string) error {
_, err := p.pool.Exec(ctx,
"INSERT INTO peerdb_stats.flow_errors(flow_name,error_message,error_type) VALUES($1,$2,$3)",
Expand Down
17 changes: 15 additions & 2 deletions flow/connectors/mysql/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,21 @@
}

func (c *MySqlConnector) ConnectionActive(ctx context.Context) error {
_, err := c.Execute(ctx, "SELECT 1")
return err
// conn, err := c.connect(ctx)

Check failure on line 146 in flow/connectors/mysql/mysql.go

View workflow job for this annotation

GitHub Actions / lint

commentedOutCode: may want to remove commented-out code (gocritic)
// if err != nil {
// c.logger.Error("failed to connect to MySQL", slog.Any("error", err))
// return err
// }
// if err := conn.Ping(); err != nil {
// c.logger.Error("failed to ping MySQL connection", slog.Any("error", err))
// return err
// }
if _, err := c.Execute(ctx, "SELECT 1"); err != nil {
c.logger.Error("failed to execute test query on MySQL connection", slog.Any("error", err))
return err
}

return nil
}

func (c *MySqlConnector) Dialer() client.Dialer {
Expand Down
4 changes: 2 additions & 2 deletions flow/connectors/mysql/rds_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestAwsRDSIAMAuthConnectForMYSQL(t *testing.T) {
},
})
require.NoError(t, err)
require.NoError(t, mysqlConnector.Ping(t.Context()))
require.NoError(t, mysqlConnector.ConnectionActive(t.Context()))
}

func TestAwsRDSIAMAuthConnectForMYSQLViaProxy(t *testing.T) {
Expand Down Expand Up @@ -66,5 +66,5 @@ func TestAwsRDSIAMAuthConnectForMYSQLViaProxy(t *testing.T) {
},
})
require.NoError(t, err)
require.NoError(t, mysqlConnector.Ping(t.Context()))
require.NoError(t, mysqlConnector.ConnectionActive(t.Context()))
}
Loading