Checkin

Author: davissp14

.flyctl/cmd/pg_unregister/main.go

@@ -1,7 +1,9 @@
 package main
 
 import (
+	"context"
 	"encoding/base64"
+	"fmt"
 	"os"
 
 	"github.com/fly-apps/postgres-flex/pkg/flypg"
@@ -12,14 +14,16 @@ func main() {
 	encodedArg := os.Args[1]
 	hostnameBytes, err := base64.StdEncoding.DecodeString(encodedArg)
 	if err != nil {
-		utils.WriteError(err)
-		sys.Exit(1)
+		utils.WriteError(fmt.Errorf("failed to decode hostname: %v", err))
+		os.Exit(1)
+		return
 	}
 
-	if err := flypg.UnregisterMemberByHostname(ctx, string(hostnameBytes)); err != nil {
+	if err := flypg.UnregisterMemberByHostname(context.Background(), string(hostnameBytes)); err != nil {
 		utils.WriteError(err)
-		sys.Exit(1)
+		os.Exit(1)
+		return
 	}
 
-	utils.WriteOutput("Member has been succesfully unregistered")
+	utils.WriteOutput("Member has been succesfully unregistered", "")
 }

cmd/standby_cleaner/main.go

@@ -9,6 +9,13 @@ import (
 	"github.com/fly-apps/postgres-flex/pkg/flypg"
 )
 
+// We need to adjust this to look at replication slots.
+// Pull ids from repmgr.show_nodes
+// Pull replication_slot ids that are inactive.
+
+// Remove replication slot if the slot_name id is inactive and is not
+// present as a repmgr node.
+
 var Minute int64 = 60
 
 func main() {
@@ -36,7 +43,7 @@ func main() {
 			fmt.Printf("Failed to check role: %s", err)
 			continue
 		}
-		if role != "primary" {
+		if role != flypg.PrimaryRoleName {
 			continue
 		}
 		standbys, err := flypgNode.RepMgr.Standbys(ctx, conn)

pkg/flypg/admin/admin.go

@@ -75,6 +75,17 @@ func DeleteDatabase(ctx context.Context, pg *pgx.Conn, name string) error {
 	return nil
 }
 
+func DropReplicationSlot(ctx context.Context, pg *pgx.Conn, name string) error {
+	sql := fmt.Sprintf("SELECT pg_drop_replication_slot('%s');", name)
+
+	_, err := pg.Exec(ctx, sql)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func EnableExtension(ctx context.Context, pg *pgx.Conn, extension string) error {
 	sql := fmt.Sprintf("CREATE EXTENSION IF NOT EXISTS %s;", extension)
 	_, err := pg.Exec(context.Background(), sql)

pkg/flypg/node.go

@@ -491,8 +491,8 @@ func UnregisterMemberByHostname(ctx context.Context, hostname string) error {
 	}
 
 	// Unregister from consul
-	if err := cs.UnregisterMember(member.ID); err != nil {
-		return fmt.Errorf("failed to unregister member %d from consul: %v", member.ID, err)
+	if err := cs.UnregisterMember(int32(member.ID)); err != nil {
+		fmt.Printf("failed to unregister member %d from consul: %v", member.ID, err)
 	}
 
 	return nil