exclude

Author: turboFei

kyuubi-common/src/main/scala/org/apache/kyuubi/config/KyuubiConf.scala

@@ -197,7 +197,9 @@ case class KyuubiConf(loadSysDefault: Boolean = true) extends Logging {
     val cloned = KyuubiConf(false)
 
     for (e <- settings.entrySet().asScala if !e.getKey.startsWith(USER_DEFAULTS_CONF_QUOTE)) {
-      cloned.set(e.getKey, e.getValue)
+      if (!serverOnlyConfigPrefixes.exists(prefix => e.getKey.startsWith(prefix))) {
+        cloned.set(e.getKey, e.getValue)
+      }
     }
 
     for ((k, v) <-
@@ -249,6 +251,7 @@ object KyuubiConf {
     java.util.Collections.emptyMap()
 
   private var serverOnlyConfEntries: Set[ConfigEntry[_]] = Set()
+  private var serverOnlyConfigPrefixes: Set[String] = Set(KYUUBI_KUBERNETES_CONF_PREFIX)
 
   private[config] def register(entry: ConfigEntry[_]): Unit =
     kyuubiConfEntriesUpdateLock.synchronized {
@@ -263,6 +266,10 @@ object KyuubiConf {
       }
     }
 
+  private[kyuubi] def registerServerOnlyConfigPrefix(prefix: String): Unit = {
+    serverOnlyConfigPrefixes += prefix
+  }
+
   // For testing only
   private[config] def unregister(entry: ConfigEntry[_]): Unit =
     kyuubiConfEntriesUpdateLock.synchronized {

kyuubi-server/src/main/scala/org/apache/kyuubi/events/handler/ServerKafkaLoggingEventHandler.scala

@@ -28,4 +28,5 @@ case class ServerKafkaLoggingEventHandler(
 
 object ServerKafkaLoggingEventHandler {
   val KAFKA_SERVER_EVENT_HANDLER_PREFIX = "kyuubi.backend.server.event.kafka"
+  KyuubiConf.registerServerOnlyConfigPrefix(KAFKA_SERVER_EVENT_HANDLER_PREFIX)
 }

kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreConf.scala

@@ -26,6 +26,8 @@ import org.apache.kyuubi.util.JavaUtils
 object JDBCMetadataStoreConf {
   final val METADATA_STORE_JDBC_DATASOURCE_PREFIX = "kyuubi.metadata.store.jdbc.datasource"
 
+  KyuubiConf.registerServerOnlyConfigPrefix(METADATA_STORE_JDBC_DATASOURCE_PREFIX)
+
   def getMetadataStoreJdbcUrl(conf: KyuubiConf): String = {
     val rawJdbcUrl = conf.get(METADATA_STORE_JDBC_URL)
     if (rawJdbcUrl.contains("<KYUUBI_HOME>")) {