From 4f2b15d5d0d9a64bb5c63603bc414425554d49db Mon Sep 17 00:00:00 2001 From: Ederene20 Date: Mon, 15 May 2023 22:19:02 +0100 Subject: [PATCH 1/2] Fix typos --- internal/flypg/readonly.go | 6 +++--- internal/flypg/ssh.go | 2 +- internal/flypg/zombie.go | 2 +- internal/supervisor/ensure_kill.go | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/internal/flypg/readonly.go b/internal/flypg/readonly.go index 055bac4e..a714c254 100644 --- a/internal/flypg/readonly.go +++ b/internal/flypg/readonly.go @@ -39,7 +39,7 @@ func DisableReadonly(ctx context.Context, n *Node) error { } if err := changeReadOnlyState(ctx, n, false); err != nil { - return fmt.Errorf("failed to disabe read-only mode: %s", err) + return fmt.Errorf("failed to disable read-only mode: %s", err) } if err := removeReadOnlyLock(); err != nil { @@ -88,7 +88,7 @@ func BroadcastReadonlyChange(ctx context.Context, n *Node, enabled bool) error { endpoint := fmt.Sprintf("http://[%s]:5500/%s", member.Hostname, RestartHaproxyEndpoint) resp, err := http.Get(endpoint) if err != nil { - log.Printf("[WARN] Failed restart haproxy on member %s: %s", member.Hostname, err) + log.Printf("[WARN] Failed to restart haproxy on member %s: %s", member.Hostname, err) continue } defer func() { _ = resp.Body.Close() }() @@ -150,7 +150,7 @@ func changeReadOnlyState(ctx context.Context, n *Node, enable bool) error { if member.Role == PrimaryRoleName { databases, err := admin.ListDatabases(ctx, conn) if err != nil { - return fmt.Errorf("failed to list database: %s", err) + return fmt.Errorf("failed to list databases: %s", err) } for _, db := range databases { diff --git a/internal/flypg/ssh.go b/internal/flypg/ssh.go index 6a130461..57c76479 100644 --- a/internal/flypg/ssh.go +++ b/internal/flypg/ssh.go @@ -29,7 +29,7 @@ func writeSSHKey() error { } if err := os.Chmod(publicKeyFile, 0600); err != nil { - return fmt.Errorf("failed to chmod private key file: %s", err) + return fmt.Errorf("failed to chmod public key file: %s", err) } return nil diff --git a/internal/flypg/zombie.go b/internal/flypg/zombie.go index 8ab5834b..f959faf6 100644 --- a/internal/flypg/zombie.go +++ b/internal/flypg/zombie.go @@ -269,7 +269,7 @@ func EvaluateClusterState(ctx context.Context, conn *pgx.Conn, node *Node) error // Clear zombie lock if it exists if ZombieLockExists() { - log.Println("Quorom has been reached. Disabling read-only mode.") + log.Println("Quorum has been reached. Disabling read-only mode.") if err := RemoveZombieLock(); err != nil { return fmt.Errorf("failed to remove zombie lock file: %s", err) } diff --git a/internal/supervisor/ensure_kill.go b/internal/supervisor/ensure_kill.go index 52f34a63..0cfdbc8a 100644 --- a/internal/supervisor/ensure_kill.go +++ b/internal/supervisor/ensure_kill.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package supervisor @@ -5,5 +6,5 @@ package supervisor import "os/exec" func ensureKill(cmd *exec.Cmd) { - // cmd.SysProcAttr.Pdeathsig in supported on on Linux, we can't do anything here + // cmd.SysProcAttr.Pdeathsig is supported on Linux, we can't do anything here } From 541fd970e3b47c8cb17959e178042925980eca6e Mon Sep 17 00:00:00 2001 From: Ederene20 Date: Mon, 15 May 2023 22:27:51 +0100 Subject: [PATCH 2/2] Fix typo --- internal/flypg/zombie.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/flypg/zombie.go b/internal/flypg/zombie.go index f959faf6..7204846d 100644 --- a/internal/flypg/zombie.go +++ b/internal/flypg/zombie.go @@ -247,7 +247,7 @@ func handleZombieLock(ctx context.Context, n *Node) error { return fmt.Errorf("failed to stop postgres: %s", err) } } else { - // TODO - Provide link to documention on how to address this + // TODO - Provide link to documentation on how to address this log.Println("[WARN] Zombie lock file does not contain a hostname.") log.Println("[WARN] This likely means that we were unable to determine who the real primary is.") }