Skip to content

Fix package installation in Partitioning Mode #7376

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix package installation in Partitioning Mode #7376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
208c85c
refactor: update request partition handling to use configured default
patrick-werner Nov 13, 2025
5e5d63f
test: add unit tests for default partition handling in request details
patrick-werner Nov 13, 2025
85052d7
add changelog entry
patrick-werner Nov 13, 2025
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
4 changes: 4 additions & 0 deletions ...sources/ca/uhn/hapi/fhir/changelog/8_6_0/7375-fix-packageInstallation-withPartitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
type: fix
issue: 7375
title: "PackageInstallerSvcImpl now consistently applies the default partition when running in STORE_AND_INSTALL mode. Terminology resources imported from NPM packages no longer fail in partitioned JPA servers with the error about writing a non-partitionable resource into a partition."
8 changes: 4 additions & 4 deletions hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import ca.uhn.fhir.context.support.IValidationSupport;
import ca.uhn.fhir.context.support.ValidationSupportContext;
import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.interceptor.model.RequestPartitionId;
import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
Expand Down Expand Up @@ -188,7 +187,7 @@ public PackageInstallOutcomeJson install(PackageInstallationSpec theInstallation

boolean exists = myTxService
.withSystemRequest()
.withRequestPartitionId(RequestPartitionId.defaultPartition())
.withRequestPartitionId(myPartitionSettings.getDefaultRequestPartitionId())
.execute(() -> {
Optional<NpmPackageVersionEntity> existing = myPackageVersionDao.findByPackageIdAndVersion(
theInstallationSpec.getName(), theInstallationSpec.getVersion());
Expand Down Expand Up @@ -550,10 +549,11 @@ private DaoMethodOutcome updateResource(IFhirResourceDao theDao, IBaseResource t
return outcome;
}

private RequestDetails createRequestDetails() {
@VisibleForTesting
RequestDetails createRequestDetails() {
SystemRequestDetails requestDetails = new SystemRequestDetails();
if (myPartitionSettings.isPartitioningEnabled()) {
requestDetails.setRequestPartitionId(RequestPartitionId.defaultPartition());
requestDetails.setRequestPartitionId(myPartitionSettings.getDefaultRequestPartitionId());
}
return requestDetails;
}
Expand Down
36 changes: 36 additions & 0 deletions ...ir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.FhirVersionEnum;
import ca.uhn.fhir.context.support.IValidationSupport;
import ca.uhn.fhir.interceptor.model.RequestPartitionId;
import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
Expand All @@ -17,6 +18,7 @@
import ca.uhn.fhir.jpa.searchparam.util.SearchParameterHelper;
import ca.uhn.fhir.mdm.log.Logs;
import ca.uhn.fhir.rest.api.server.RequestDetails;
import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
import ca.uhn.fhir.rest.server.SimpleBundleProvider;
import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
import ca.uhn.hapi.converters.canonical.VersionCanonicalizer;
Expand Down Expand Up @@ -230,6 +232,40 @@ public void testValidForUpload_WhenSearchParameterValidatorThrowsAnExceptionOthe



@Test
public void testCreateRequestDetailsUsesDefaultPartition() {
myPartitionSettings.setPartitioningEnabled(true);
myPartitionSettings.setDefaultPartitionId(42);

RequestDetails requestDetails = mySvc.createRequestDetails();
assertTrue(requestDetails instanceof SystemRequestDetails);
SystemRequestDetails systemRequestDetails = (SystemRequestDetails) requestDetails;

assertEquals(RequestPartitionId.fromPartitionId(42), systemRequestDetails.getRequestPartitionId());
}

@Test
public void testInstallPackageUsesDefaultPartition() throws IOException {
myPartitionSettings.setPartitioningEnabled(true);
myPartitionSettings.setDefaultPartitionId(7);

CodeSystem newCodeSystem = new CodeSystem();
newCodeSystem.setId("CodeSystem/newcs");
newCodeSystem.setUrl("http://partitioned-code-system");
newCodeSystem.setContent(CodeSystem.CodeSystemContentMode.COMPLETE);

PackageInstallationSpec spec = setupResourceInPackage(null, newCodeSystem, myCodeSystemDao);

mySvc.install(spec);

verify(myCodeSystemDao).create(any(CodeSystem.class), myRequestDetailsCaptor.capture());
RequestDetails requestDetails = myRequestDetailsCaptor.getValue();

assertTrue(requestDetails instanceof SystemRequestDetails);
SystemRequestDetails systemRequestDetails = (SystemRequestDetails) requestDetails;
assertEquals(RequestPartitionId.fromPartitionId(7), systemRequestDetails.getRequestPartitionId());
}

@Test
public void testDontTryToInstallDuplicateCodeSystem_CodeSystemAlreadyExistsWithDifferentId() throws IOException {
// Setup
Expand Down
Loading