Skip to content

Simplify bootstrapServiceAndCreatePolarisPrincipalForRealm #2172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dimas-b merged 1 commit into from
Jul 24, 2025
Merged

Simplify bootstrapServiceAndCreatePolarisPrincipalForRealm #2172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions ...main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ public synchronized Map<String, PrincipalSecretsResult> bootstrapRealms(
initializeForRealm(
datasourceOperations, realmContext, bootstrapOptions.rootCredentialsSet());
PrincipalSecretsResult secretsResult =
bootstrapServiceAndCreatePolarisPrincipalForRealm(
realmContext, metaStoreManagerMap.get(realm));
bootstrapServiceAndCreatePolarisPrincipalForRealm(realmContext);
results.put(realm, secretsResult);
}
}
Expand Down Expand Up @@ -228,14 +227,14 @@ public synchronized EntityCache getOrCreateEntityCache(
* metastore and creates a root service principal.
*/
private PrincipalSecretsResult bootstrapServiceAndCreatePolarisPrincipalForRealm(
RealmContext realmContext, PolarisMetaStoreManager metaStoreManager) {
RealmContext realmContext) {
// While bootstrapping we need to act as a fake privileged context since the real
// CallContext may not have been resolved yet.
PolarisMetaStoreManager metaStoreManager =
metaStoreManagerMap.get(realmContext.getRealmIdentifier());
BasePersistence metaStore = sessionSupplierMap.get(realmContext.getRealmIdentifier()).get();
PolarisCallContext polarisContext =
new PolarisCallContext(
realmContext,
sessionSupplierMap.get(realmContext.getRealmIdentifier()).get(),
diagServices);
new PolarisCallContext(realmContext, metaStore, diagServices);
if (CallContext.getCurrentContext() == null) {
CallContext.setCurrentContext(polarisContext);
}
Expand Down Expand Up @@ -264,13 +263,11 @@ private PrincipalSecretsResult bootstrapServiceAndCreatePolarisPrincipalForRealm
PolarisEntityType.PRINCIPAL,
PolarisEntitySubType.NULL_SUBTYPE,
PolarisEntityConstants.getRootPrincipalName());
PrincipalSecretsResult secrets =
metaStoreManager.loadPrincipalSecrets(
polarisContext,
PolarisEntity.of(rootPrincipalLookup.getEntity())
.getInternalPropertiesAsMap()
.get(PolarisEntityConstants.getClientIdPropertyName()));
return secrets;
return metaStoreManager.loadPrincipalSecrets(
polarisContext,
PolarisEntity.of(rootPrincipalLookup.getEntity())
.getInternalPropertiesAsMap()
.get(PolarisEntityConstants.getClientIdPropertyName()));
}

/**
Expand All @@ -283,11 +280,9 @@ private PrincipalSecretsResult bootstrapServiceAndCreatePolarisPrincipalForRealm
private void checkPolarisServiceBootstrappedForRealm(RealmContext realmContext) {
PolarisMetaStoreManager metaStoreManager =
metaStoreManagerMap.get(realmContext.getRealmIdentifier());
BasePersistence metaStore = sessionSupplierMap.get(realmContext.getRealmIdentifier()).get();
PolarisCallContext polarisContext =
new PolarisCallContext(
realmContext,
sessionSupplierMap.get(realmContext.getRealmIdentifier()).get(),
diagServices);
new PolarisCallContext(realmContext, metaStore, diagServices);
if (CallContext.getCurrentContext() == null) {
CallContext.setCurrentContext(polarisContext);
}
Expand Down
24 changes: 10 additions & 14 deletions ...rc/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ public synchronized Map<String, PrincipalSecretsResult> bootstrapRealms(
if (!metaStoreManagerMap.containsKey(realm)) {
initializeForRealm(realmContext, rootCredentialsSet);
PrincipalSecretsResult secretsResult =
bootstrapServiceAndCreatePolarisPrincipalForRealm(
realmContext, metaStoreManagerMap.get(realm));
bootstrapServiceAndCreatePolarisPrincipalForRealm(realmContext);
results.put(realm, secretsResult);
}
}
Expand Down Expand Up @@ -179,18 +178,17 @@ public synchronized EntityCache getOrCreateEntityCache(

/**
* This method bootstraps service for a given realm: i.e. creates all the needed entities in the
* metastore and creates a root service principal. After that we rotate the root principal
* credentials and print them to stdout
* metastore and creates a root service principal.
*/
private PrincipalSecretsResult bootstrapServiceAndCreatePolarisPrincipalForRealm(
RealmContext realmContext, PolarisMetaStoreManager metaStoreManager) {
RealmContext realmContext) {
// While bootstrapping we need to act as a fake privileged context since the real
// CallContext may not have been resolved yet.
var polarisContext =
new PolarisCallContext(
realmContext,
sessionSupplierMap.get(realmContext.getRealmIdentifier()).get(),
diagServices);
PolarisMetaStoreManager metaStoreManager =
metaStoreManagerMap.get(realmContext.getRealmIdentifier());
BasePersistence metaStore = sessionSupplierMap.get(realmContext.getRealmIdentifier()).get();
PolarisCallContext polarisContext =
new PolarisCallContext(realmContext, metaStore, diagServices);
if (CallContext.getCurrentContext() == null) {
CallContext.setCurrentContext(polarisContext);
}
Expand Down Expand Up @@ -236,11 +234,9 @@ private PrincipalSecretsResult bootstrapServiceAndCreatePolarisPrincipalForRealm
private void checkPolarisServiceBootstrappedForRealm(RealmContext realmContext) {
PolarisMetaStoreManager metaStoreManager =
metaStoreManagerMap.get(realmContext.getRealmIdentifier());
BasePersistence metaStore = sessionSupplierMap.get(realmContext.getRealmIdentifier()).get();
PolarisCallContext polarisContext =
new PolarisCallContext(
realmContext,
sessionSupplierMap.get(realmContext.getRealmIdentifier()).get(),
diagServices);
new PolarisCallContext(realmContext, metaStore, diagServices);
if (CallContext.getCurrentContext() == null) {
CallContext.setCurrentContext(polarisContext);
}
Expand Down