Skip to content

Fix connection bug #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 24, 2023
Merged

Fix connection bug #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions internal/flypg/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func (n *Node) PostInit(ctx context.Context) error {
case StandbyRoleName:
// Register existing standby to take-on any configuration changes.
if err := n.RepMgr.registerStandby(); err != nil {
fmt.Printf("failed to register standby: %s\n", err)
fmt.Printf("failed to register existing standby: %s\n", err)
}
default:
return fmt.Errorf("member has unknown role: %q", member.Role)
Expand Down Expand Up @@ -342,7 +342,7 @@ func (n *Node) PostInit(ctx context.Context) error {
// Configure as standby
fmt.Println("Registering standby")
if err := n.RepMgr.registerStandby(); err != nil {
fmt.Printf("failed to register standby: %s\n", err)
fmt.Printf("failed to register new standby: %s\n", err)
}

// Let the boot process know that we've already been configured.
Expand Down
6 changes: 3 additions & 3 deletions internal/flypg/registration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func isRegistered(ctx context.Context, conn *pgx.Conn, n *Node) (bool, error) {
// Below is for backwards compatibility
databases, err := admin.ListDatabases(ctx, conn)
if err != nil {
return false, err
return false, fmt.Errorf("failed to list databases: %s", err)
}

repmgrExists := false
Expand All @@ -38,11 +38,11 @@ func isRegistered(ctx context.Context, conn *pgx.Conn, n *Node) (bool, error) {

repConn, err := n.RepMgr.NewLocalConnection(ctx)
if err != nil {
return false, err
return false, fmt.Errorf("failed to connect to local repmgr: %s", err)
}
defer func() { _ = repConn.Close(ctx) }()

member, err := n.RepMgr.Member(ctx, conn)
member, err := n.RepMgr.Member(ctx, repConn)
if err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return false, nil
Expand Down