Cleanup

Author: davissp14

.flyctl/cmd/pg_unregister/main.go

@@ -19,7 +19,9 @@ func main() {
 		return
 	}
 
-	if err := flypg.UnregisterMemberByHostname(context.Background(), string(hostnameBytes)); err != nil {
+	node := flypg.NewNode()
+
+	if err := node.UnregisterMemberByHostname(context.Background(), string(hostnameBytes)); err != nil {
 		utils.WriteError(err)
 		os.Exit(1)
 		return

cmd/standby_cleaner/main.go

@@ -60,7 +60,7 @@ func main() {
 			if err != nil {
 				// TODO - Verify the exception that's getting thrown.
 				if time.Now().Sub(seenAt[standby.Id]) >= deadMemberRemovalThreshold {
-					if err := flypg.UnregisterMemberByID(ctx, int32(standby.Id)); err != nil {
+					if err := flypgNode.UnregisterMemberByID(ctx, int32(standby.Id)); err != nil {
 						fmt.Printf("failed to unregister member %d: %v\n", standby.Id, err.Error())
 						continue
 					}

pkg/flypg/node.go

@@ -323,6 +323,34 @@ func (n *Node) NewLocalConnection(ctx context.Context, database string) (*pgx.Co
 	return openConnection(ctx, host, database, n.OperatorCredentials)
 }
 
+func (n *Node) UnregisterMemberByHostname(ctx context.Context, hostname string) error {
+	cs, err := state.NewClusterState()
+	if err != nil {
+		fmt.Printf("failed initialize cluster state store. %v", err)
+	}
+
+	member, err := cs.FindMemberByHostname(hostname)
+	if err != nil {
+		return err
+	}
+
+	return n.unregisterNode(ctx, cs, member)
+}
+
+func (n *Node) UnregisterMemberByID(ctx context.Context, id int32) error {
+	cs, err := state.NewClusterState()
+	if err != nil {
+		fmt.Printf("failed initialize cluster state store. %v", err)
+	}
+
+	member, err := cs.FindMemberByID(id)
+	if err != nil {
+		return err
+	}
+
+	return n.unregisterNode(ctx, cs, member)
+}
+
 func (n *Node) isInitialized() bool {
 	_, err := os.Stat(n.DataDir)
 	if os.IsNotExist(err) {
@@ -383,6 +411,25 @@ func (n *Node) createRequiredUsers(ctx context.Context, conn *pgx.Conn) error {
 	return nil
 }
 
+func (n *Node) unregisterNode(ctx context.Context, cs *state.ClusterState, member *state.Member) error {
+	if member == nil {
+		return state.ErrMemberNotFound
+	}
+
+	// Unregister from repmgr
+	err := n.RepMgr.UnregisterStandby(int(member.ID))
+	if err != nil {
+		return fmt.Errorf("failed to unregister member %d from repmgr: %s", member.ID, err)
+	}
+
+	// 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)
+	}
+
+	return nil
+}
+
 type HBAEntry struct {
 	Type     string
 	Database string
@@ -464,75 +511,6 @@ func (n *Node) setDefaultHBA() error {
 	return nil
 }
 
-func UnregisterMemberByHostname(ctx context.Context, hostname string) error {
-	cs, err := state.NewClusterState()
-	if err != nil {
-		fmt.Printf("failed initialize cluster state store. %v", err)
-	}
-
-	member, err := cs.FindMemberByHostname(hostname)
-	if err != nil {
-		return err
-	}
-
-	if member == nil {
-		return state.ErrMemberNotFound
-	}
-
-	node, err := NewNode()
-	if err != nil {
-		return err
-	}
-
-	// Unregister from repmgr
-	err = node.RepMgr.UnregisterStandby(int(member.ID))
-	if err != nil {
-		return fmt.Errorf("failed to unregister member %d from repmgr: %s", member.ID, err)
-	}
-
-	// Unregister from consul
-	if err := cs.UnregisterMember(int32(member.ID)); err != nil {
-		fmt.Printf("failed to unregister member %d from consul: %v", member.ID, err)
-	}
-
-	return nil
-}
-
-func UnregisterMemberByID(ctx context.Context, id int32) error {
-
-	cs, err := state.NewClusterState()
-	if err != nil {
-		fmt.Printf("failed initialize cluster state store. %v", err)
-	}
-
-	member, err := cs.FindMemberByID(id)
-	if err != nil {
-		return err
-	}
-
-	if member == nil {
-		return state.ErrMemberNotFound
-	}
-
-	node, err := NewNode()
-	if err != nil {
-		return err
-	}
-
-	// Unregister from repmgr
-	err = node.RepMgr.UnregisterStandby(int(member.ID))
-	if err != nil {
-		return fmt.Errorf("failed to unregister member %d from repmgr: %s", member.ID, err)
-	}
-
-	// 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)
-	}
-
-	return nil
-}
-
 func openConnection(parentCtx context.Context, host string, database string, creds Credentials) (*pgx.Conn, error) {
 	ctx, cancel := context.WithTimeout(parentCtx, 10*time.Second)
 	defer cancel()