Skip to content

Commit b1ca547

Browse files
dilipgodhiaDilip Godhia
andauthored
Fix(cloud-sql-proxy): Correct port specification for Cloud SQL proxy (#1362)
Specifically, this commit: - Modifies `cloud-sql-proxy.sh` to replace '=tcp:' with '?port=' in the instance connection strings for both the Hive metastore and any additional instances. - Updates the `README.md` to reflect the correct metadata format for specifying additional instances. This ensures compatibility with the updated Cloud SQL proxy and prevents connection failures. Co-authored-by: Dilip Godhia <[email protected]>
1 parent 1d9d3e6 commit b1ca547

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

cloud-sql-proxy/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ metadata on a given Cloud SQL instance.
1515
Specifically:
1616
* **MySQL 8.4 has updated its security model that were incompatible with the earlier version of this CloudSQL Proxy script.**
1717

18+
1819
To avoid connectivity issues, we highly recommend:
1920
* **Always testing your Cloud SQL Proxy configuration thoroughly** before adopting new Cloud SQL database versions or enabling advanced security features like Shared CA or Customer-managed CA.
2021

@@ -84,7 +85,7 @@ shared hive metastore.
8485
a. Optionally add other instances, paired with distinct TCP ports for further I/O.
8586

8687
```bash
87-
--metadata "additional-cloud-sql-instances=<PROJECT_ID>:<REGION>:<ANOTHER_INSTANCE_NAME>=tcp<PORT_#>[,...]"
88+
--metadata "additional-cloud-sql-instances=<PROJECT_ID>:<REGION>:<ANOTHER_INSTANCE_NAME>=tcp:<PORT_NO>[,...]"
8889
```
8990

9091
1. Submit pyspark_metastore_test.py to the cluster to validate the metatstore

cloud-sql-proxy/cloud-sql-proxy.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ function get_metastore_instance() {
374374
metastore_instance+="?port=${METASTORE_PROXY_PORT}"
375375
fi
376376
fi
377+
metastore_instance="${metastore_instance//=tcp:/?port=}"
377378
echo "${metastore_instance}"
378379
}
379380

@@ -393,6 +394,7 @@ function get_proxy_flags() {
393394
if [[ ${PROXY_VERSION} == "1" ]]; then
394395
proxy_instances_flags+=" -instances=${metastore_instance}"
395396
else
397+
metastore_instance="${metastore_instance//=tcp:/?port=}"
396398
proxy_instances_flags+=" ${metastore_instance}"
397399
fi
398400
fi
@@ -402,7 +404,9 @@ function get_proxy_flags() {
402404
if [[ ${PROXY_VERSION} == "1" ]]; then
403405
proxy_instances_flags+=" -instances_metadata=instance/${ADDITIONAL_INSTANCES_KEY}"
404406
else
405-
proxy_instances_flags+=" instances_metadata=instance/${ADDITIONAL_INSTANCES_KEY}"
407+
updated_additional_instances="${ADDITIONAL_INSTANCES//,/ }"
408+
updated_additional_instances="${updated_additional_instances//=tcp:/?port=}"
409+
proxy_instances_flags+=" ${updated_additional_instances} "
406410
fi
407411
fi
408412

0 commit comments

Comments
 (0)