Merge pull request #444 from Breeding-Insight/feature/BI-2450

[BI-2450]BrAPI Server DB connections exhausted on biapi startup caching

Author: davedrp

.env.template

@@ -61,4 +61,12 @@ AWS_GENO_BUCKET=<s3 bucket for genotypic data uploads>
 AWS_S3_ENDPOINT=<s3 endpoint, default https://s3.us-east-1.amazonaws.com>
 
 BRAPI_VENDOR_SUBMISSION_ENABLED=false #can a submission be sent to a vendor via BrAPI
-BRAPI_VENDOR_CHECK_FREQUENCY=1d #how often to check for vendor updates for sample submissions
+BRAPI_VENDOR_CHECK_FREQUENCY=1d #how often to check for vendor updates for sample submissions
+
+#The initial caching of each type of object needs to be staggered by the prescribed number of seconds
+GERMPLASM_START_DELAY=5s
+STUDY_START_DELAY=10s
+TRIAL_START_DELAY=15s
+TRAIT_START_DELAY=20s
+OBSERVATION_START_DELAY=25s
+OBSERVATION_UNIT_START_DELAY=30s

src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIGermplasmDAO.java

@@ -78,7 +78,7 @@ public BrAPIGermplasmDAO(ProgramDAO programDAO, ImportDAO importDAO, BrAPIDAOUti
         this.brAPIEndpointProvider = brAPIEndpointProvider;
     }
 
-    @Scheduled(initialDelay = "2s")
+    @Scheduled(initialDelay = "${startup.delay.germplasm}")
     public void setup() {
         if(!runScheduledTasks) {
             return;

src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIObservationDAO.java

@@ -87,7 +87,7 @@ public BrAPIObservationDAO(ProgramDAO programDAO,
         this.programCache = programCacheProvider.getProgramCache(this::fetchProgramObservations, BrAPIObservation.class);
     }
 
-    @Scheduled(initialDelay = "3s")
+    @Scheduled(initialDelay = "${startup.delay.observation}")
     public void setup() {
         if(!runScheduledTasks) {
             return;

src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIObservationUnitDAO.java

@@ -95,7 +95,7 @@ public BrAPIObservationUnitDAO(ProgramDAO programDAO,
         this.programCache = programCacheProvider.getProgramCache(this::fetchProgramObservationUnits, BrAPIObservationUnit.class);
     }
 
-    @Scheduled(initialDelay = "3s")
+    @Scheduled(initialDelay = "${startup.delay.observation_unit}")
     public void setup() {
         if(!runScheduledTasks) {
             return;

src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIStudyDAO.java

@@ -65,7 +65,7 @@ public BrAPIStudyDAO(ProgramDAO programDAO, ImportDAO importDAO, BrAPIDAOUtil br
         this.programCache = programCacheProvider.getProgramCache(this::fetchProgramStudy, BrAPIStudy.class);
     }
 
-    @Scheduled(initialDelay = "2s")
+    @Scheduled(initialDelay = "${startup.delay.study}")
     public void setup() {
         if(!runScheduledTasks) {
             return;

src/main/java/org/breedinginsight/brapi/v2/dao/impl/BrAPITrialDAOImpl.java

@@ -81,7 +81,7 @@ public BrAPITrialDAOImpl(ProgramCacheProvider programCacheProvider,
     }
 
 
-    @Scheduled(initialDelay = "2s")
+    @Scheduled(initialDelay = "${startup.delay.trial}")
     public void setup() {
         if(!runScheduledTasks) {
             return;

src/main/java/org/breedinginsight/daos/impl/TraitDAOImpl.java

@@ -109,7 +109,7 @@ public TraitDAOImpl(Configuration config,
         this.runScheduledTasks = runScheduledTasks;
     }
 
-    @Scheduled(initialDelay = "2s")
+    @Scheduled(initialDelay = "${startup.delay.trait}")
     public void setup() {
         if(!runScheduledTasks) {
             return;

src/main/resources/application.yml

@@ -205,3 +205,11 @@ aws:
     buckets:
       genotype:
         bucket: ${AWS_GENO_BUCKET}
+startup:
+  delay:
+    germplasm: ${GERMPLASM_START_DELAY:2s}
+    study: ${STUDY_START_DELAY:2s}
+    trial: ${TRIAL_START_DELAY:2s}
+    trait: ${TRAIT_START_DELAY:2s}
+    observation: ${OBSERVATION_START_DELAY:3s}
+    observation_unit: ${OBSERVATION_UNIT_START_DELAY:3s}