honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce thread contention during tests

This commit is contained in:
James Agnew 2019-02-15 14:18:14 -05:00
parent a35f30b18e
commit 09920ad545
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-jpaserver-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/AddTableByColumnTaskTest.java
View File

@ -24,7 +24,7 @@ public class AddTableByColumnTaskTest extends BaseTest {
private static class MyMigrationTasks extends BaseMigrationTasks<VersionEnum> {
BaseSearchParamRegistry
public MyMigrationTasks() {
Builder v = forVersion(VersionEnum.V3_5_0);

15
hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/BaseSearchParamRegistry.java
View File

@ -9,9 +9,9 @@ package ca.uhn.fhir.jpa.searchparam.registry;
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -48,9 +48,8 @@ public abstract class BaseSearchParamRegistry<SP extends IBaseResource> implemen
private static final int MAX_MANAGED_PARAM_COUNT = 10000;
private static final Logger ourLog = LoggerFactory.getLogger(BaseSearchParamRegistry.class);
private static long REFRESH_INTERVAL = 60 * DateUtils.MILLIS_PER_MINUTE;
private static final int MAX_RETRIES = 60; // 5 minutes
private static long REFRESH_INTERVAL = 60 * DateUtils.MILLIS_PER_MINUTE;
@Autowired
private ModelConfig myModelConfig;
@Autowired
@ -327,8 +326,12 @@ public abstract class BaseSearchParamRegistry<SP extends IBaseResource> implemen
mySearchParamProvider = theSearchParamProvider;
}
synchronized int refreshCacheWithRetry() {
Retrier<Integer> refreshCacheRetrier = new Retrier(() -> mySearchParamProvider.refreshCache(this, REFRESH_INTERVAL), MAX_RETRIES);
int refreshCacheWithRetry() {
Retrier<Integer> refreshCacheRetrier = new Retrier(() -> {
synchronized(BaseSearchParamRegistry.this) {
return mySearchParamProvider.refreshCache(this, REFRESH_INTERVAL);
}
}, MAX_RETRIES);
return refreshCacheRetrier.runWithRetry();
}