Cleanup

internal/flypg/collation.go

@@ -38,7 +38,7 @@ func collationHashChanged(versionHash string) (bool, error) {
 func calculateLocaleVersionHash() (string, error) {
 	output, err := utils.RunCommand("locale --version", "postgres")
 	if err != nil {
-		return "", fmt.Errorf("failed to capture ldd version: %w", err)
+		return "", fmt.Errorf("failed to read locale version: %w", err)
 	}
 
 	hash := sha256.Sum256(output)

internal/flypg/node.go

@@ -306,8 +306,7 @@ func (n *Node) PostInit(ctx context.Context) error {
 				}
 			}
 
-			// There was an OS change that can impact certain users during a Flex upgrade.
-			// This is a safety check to ensure that the collation integrity is maintained.
+			// This is a safety check to ensure collation integrity is maintained.
 			if err := n.evaluateCollationIntegrity(ctx, conn); err != nil {
 				log.Printf("[WARN] Problem occurred while evaluating collation integrity: %s", err)
 			}
@@ -480,7 +479,7 @@ func setDirOwnership() error {
 }
 
 func (n *Node) evaluateCollationIntegrity(ctx context.Context, conn *pgx.Conn) error {
-	// Capture the current collation version hash.
+	// Calculate the current collation version hash.
 	versionHash, err := calculateLocaleVersionHash()
 	if err != nil {
 		return fmt.Errorf("failed to calculate collation sum: %w", err)
@@ -518,11 +517,14 @@ func (n *Node) evaluateCollationIntegrity(ctx context.Context, conn *pgx.Conn) e
 
 		log.Printf("[INFO] Refreshing collations for database %s\n", db.Name)
 
-		// Refresh collations for the database.
 		if err := refreshCollations(ctx, dbConn, db.Name); err != nil {
 			return fmt.Errorf("failed to refresh collations for db %s: %s", db.Name, err)
 		}
 
+		// TODO - Consider logging a link to documentation on how to resolve collation issues not resolved by the refresh process.
+
+		// The collation refresh process should resolve "most" issues, but there are cases that may require
+		// re-indexing or other manual intervention. In the event any objects are found we will log a warning.
 		colObjects, err := impactedCollationObjects(ctx, dbConn)
 		if err != nil {
 			return fmt.Errorf("failed to fetch impacted collation objects: %s", err)
@@ -534,15 +536,17 @@ func (n *Node) evaluateCollationIntegrity(ctx context.Context, conn *pgx.Conn) e
 		}
 	}
 
+	// Don't set the version file if there are collation issues.
+	// This will force the system to re-evaluate the collation integrity on the next boot and ensure
+	// issues continue to be logged.
 	if collationIssues > 0 {
 		return nil
 	}
 
 	// No collation issues found, we can safely update the version file.
 	// This will prevent the system from re-evaluating the collation integrity on every boot.
-	log.Printf("[INFO] No collation mismatches detected. Updating collation version file.\n")
 	if err := writeCollationVersionFile(versionHash); err != nil {
-		return fmt.Errorf("failed to write collation lock: %s", err)
+		return fmt.Errorf("failed to write collation version file: %s", err)
 	}
 
 	return nil

internal/utils/shell.go

@@ -11,6 +11,8 @@ import (
 	"syscall"
 )
 
+// TODO - RunCommand should take a context.
+
 func RunCommand(cmdStr, usr string) ([]byte, error) {
 	uid, gid, err := SystemUserIDs(usr)
 	if err != nil {