diff --git a/extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java b/extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java index 2fc1d4c5f1..f3d028eb9d 100644 --- a/extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java +++ b/extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java @@ -135,17 +135,12 @@ public synchronized Map bootstrapRealms( for (String realm : realms) { RealmContext realmContext = () -> realm; - if (!metaStoreManagerMap.containsKey(realmContext.getRealmIdentifier())) { + if (!metaStoreManagerMap.containsKey(realm)) { initializeForRealm(realmContext, rootCredentialsSet, true); PrincipalSecretsResult secretsResult = bootstrapServiceAndCreatePolarisPrincipalForRealm( - realmContext, metaStoreManagerMap.get(realmContext.getRealmIdentifier())); - - if (rootCredentialsSet.credentials().containsKey(realm)) { - LOGGER.info("Bootstrapped realm {} using preset credentials.", realm); - } - - results.put(realmContext.getRealmIdentifier(), secretsResult); + realmContext, metaStoreManagerMap.get(realm)); + results.put(realm, secretsResult); } } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java index 2c97ebd638..dc615341ae 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java @@ -113,12 +113,12 @@ public synchronized Map bootstrapRealms( for (String realm : realms) { RealmContext realmContext = () -> realm; - if (!metaStoreManagerMap.containsKey(realmContext.getRealmIdentifier())) { + if (!metaStoreManagerMap.containsKey(realm)) { initializeForRealm(realmContext, rootCredentialsSet); PrincipalSecretsResult secretsResult = bootstrapServiceAndCreatePolarisPrincipalForRealm( - realmContext, metaStoreManagerMap.get(realmContext.getRealmIdentifier())); - results.put(realmContext.getRealmIdentifier(), secretsResult); + realmContext, metaStoreManagerMap.get(realm)); + results.put(realm, secretsResult); } } diff --git a/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java b/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java index 59fe200539..895e5b51b1 100644 --- a/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java +++ b/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java @@ -32,7 +32,6 @@ import org.apache.polaris.core.context.RealmContext; import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory; import org.apache.polaris.core.persistence.PolarisMetaStoreManager; -import org.apache.polaris.core.persistence.bootstrap.RootCredentials; import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet; import org.apache.polaris.core.persistence.dao.entity.PrincipalSecretsResult; import org.apache.polaris.core.persistence.transactional.TransactionalPersistence; @@ -104,28 +103,6 @@ public Map bootstrapRealms( Iterable realms, RootCredentialsSet rootCredentialsSet) { Map results = super.bootstrapRealms(realms, rootCredentialsSet); bootstrappedRealms.addAll(results.keySet()); - - Map presetCredentials = rootCredentialsSet.credentials(); - for (String realmId : realms) { - if (presetCredentials.containsKey(realmId)) { - // Credentials provided in the runtime env... no need to print - continue; - } - - PrincipalSecretsResult principalSecrets = results.get(realmId); - if (principalSecrets == null) { - continue; // already bootstrapped (possible benign race) - } - - String msg = - String.format( - "realm: %1s root principal credentials: %2s:%3s", - realmId, - principalSecrets.getPrincipalSecrets().getPrincipalClientId(), - principalSecrets.getPrincipalSecrets().getMainSecret()); - System.out.println(msg); - } - return results; } }