From 6040fbd749eb075b4d7c6df221d97718bc0a38a1 Mon Sep 17 00:00:00 2001 From: Zhendong Bai Date: Mon, 23 Dec 2024 18:10:58 +0800 Subject: [PATCH] Update TiCatalog.scala --- .../sql/catalyst/catalog/TiCatalog.scala | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/sql/catalyst/catalog/TiCatalog.scala b/core/src/main/scala/org/apache/spark/sql/catalyst/catalog/TiCatalog.scala index a73c907810..74f1157291 100644 --- a/core/src/main/scala/org/apache/spark/sql/catalyst/catalog/TiCatalog.scala +++ b/core/src/main/scala/org/apache/spark/sql/catalyst/catalog/TiCatalog.scala @@ -54,14 +54,24 @@ class TiCatalog extends TableCatalog with SupportsNamespaces { override def initialize(name: String, options: CaseInsensitiveStringMap): Unit = { _name = Some(name) + def getPdAddressFromConf: String = { + if (!options.containsKey("pd.addresses") && !options.containsKey("pd.address")) { + throw new Exception("missing configuration spark.sql.catalog.tidb_catalog.pd.addresses") + } + options.getOrDefault("pd.addresses", options.get("pd.address")) + } + val pdAddress: String = if (TiAuthorization.enableAuth) { - tiAuthorization.get.getPDAddresses() - } else { - if (!options.containsKey("pd.addresses") && !options.containsKey("pd.address")) { - throw new Exception("missing configuration spark.sql.catalog.tidb_catalog.pd.addresses") + try { + tiAuthorization.get.getPDAddresses() + } catch { + case e: Throwable => + logger.warn("getPDAddress error", e) + getPdAddressFromConf } - options.getOrDefault("pd.addresses", options.get("pd.address")) + } else { + getPdAddressFromConf } logger.info(s"Initialize TiCatalog with name: $name, pd address: $pdAddress")