Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(rds): wait for the final PostgreSQL server before reporting the instance ready (#3405)

TATSUNO “Taz” Yasuhiro14b0875a27cb
diff --git a/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java b/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java
index 81be337b8d..8a8cae22d1 100644
--- a/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java
@@ -734,6 +734,7 @@ public class RdsService implements Resettable, ResourceProvider {
try {
sqlDump = containerManager.createPostgresSnapshot(instance.getContainerId(), instance.getMasterUsername());
} catch (Exception e) {
+ LOG.warnv(e, "Failed to create snapshot {0} of DB instance {1}", snapshotId, instanceId);
throw new AwsException("InvalidDBInstanceState", "Failed to create snapshot: " + e.getMessage(), 400);
}
}
diff --git a/src/main/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManager.java b/src/main/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManager.java
index 8e5c608909..225fd25aac 100644
--- a/src/main/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManager.java
+++ b/src/main/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManager.java
@@ -480,10 +480,16 @@ public class RdsContainerManager {
""";
}
+ /**
+ * Connects over TCP loopback on purpose. The official image runs first-boot init against a
+ * temporary server that listens only on the Unix socket, so a socket connection can succeed
+ * before the final server is up. Loopback is trusted by the generated pg_hba.conf.
+ */
private void initializePostgresIamRole(String containerName, String containerId, String masterUsername) {
String effectiveUser = (masterUsername != null && !masterUsername.isBlank()) ? masterUsername : "postgres";
String[] cmd = {
"psql",
+ "-h", "127.0.0.1",
"-v", "ON_ERROR_STOP=1",
"-U", effectiveUser,
"-d", "postgres",
diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerPostgresTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerPostgresTest.java
index feeddebf78..3554225793 100644
--- a/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerPostgresTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerPostgresTest.java
@@ -154,7 +154,7 @@ class RdsContainerManagerPostgresTest {
}
private void waitForPostgresReady(String containerId, String user, String dbName, int maxSeconds) {
- String[] cmd = {"psql", "-U", user, "-d", dbName, "-c", "SELECT 1"};
+ String[] cmd = {"psql", "-h", "127.0.0.1", "-U", user, "-d", dbName, "-c", "SELECT 1"};
for (int i = 0; i < maxSeconds; i++) {
try {
ExecResult result = exec(containerId, cmd, 5);