diff --git a/pkg/sql/logictest/logic.go b/pkg/sql/logictest/logic.go index b9f130834ca0..e6b35052227b 100644 --- a/pkg/sql/logictest/logic.go +++ b/pkg/sql/logictest/logic.go @@ -2269,7 +2269,9 @@ func (t *logicTest) purgeZoneConfig() { for i := 0; i < t.cluster.NumServers(); i++ { sysconfigProvider := t.cluster.Server(i).SystemConfigProvider() sysconfig := sysconfigProvider.GetSystemConfig() - sysconfig.PurgeZoneConfigCache() + if sysconfig != nil { + sysconfig.PurgeZoneConfigCache() + } } } diff --git a/pkg/testutils/serverutils/test_cluster_shim.go b/pkg/testutils/serverutils/test_cluster_shim.go index 80821bc0c5fd..22c6eb75f05a 100644 --- a/pkg/testutils/serverutils/test_cluster_shim.go +++ b/pkg/testutils/serverutils/test_cluster_shim.go @@ -264,7 +264,9 @@ func StartNewTestCluster( for i := 0; i < cluster.NumServers(); i++ { sysconfigProvider := cluster.Server(i).SystemConfigProvider() sysconfig := sysconfigProvider.GetSystemConfig() - sysconfig.PurgeZoneConfigCache() + if sysconfig != nil { + sysconfig.PurgeZoneConfigCache() + } } return cluster }