mirror of
https://github.com/neondatabase/neon.git
synced 2026-05-28 10:30:40 +00:00
storcon db: load safekeepers from DB again (#11087)
Earlier PR #11041 soft-disabled the loading code for safekeepers from
the storcon db. This PR makes us load the safekeepers from the database
again, now that we have [JWTs available on
staging](https://github.com/neondatabase/neon/pull/11087) and soon on
prod.
This reverts commit 23fb8053c5.
Part of https://github.com/neondatabase/cloud/issues/24727
This commit is contained in:
committed by
Arpad Müller
parent
93983ac5fc
commit
9fbb33e9d9
@@ -1133,13 +1133,6 @@ class NeonEnv:
|
||||
if self.storage_controller_config is not None:
|
||||
cfg["storage_controller"] = self.storage_controller_config
|
||||
|
||||
# Disable new storcon flag in compat tests
|
||||
if config.test_may_use_compatibility_snapshot_binaries:
|
||||
if "storage_controller" in cfg:
|
||||
cfg["storage_controller"]["load_safekeepers"] = False
|
||||
else:
|
||||
cfg["storage_controller"] = {"load_safekeepers": False}
|
||||
|
||||
# Create config for pageserver
|
||||
http_auth_type = "NeonJWT" if config.auth_enabled else "Trust"
|
||||
pg_auth_type = "NeonJWT" if config.auth_enabled else "Trust"
|
||||
|
||||
Reference in New Issue
Block a user