Merge pull request #2421 from marklogic/bugfix/DHFPROD-2421

DHFPROD-2421: move creation/release of client into the service method…

Author: aebadirad

web/src/main/java/com/marklogic/hub/web/model/FlowStepModel.java

@@ -188,18 +188,20 @@ public void setLatestJob(LatestJob latestJob) {
     }
 
     public void setJobs(FlowJobs flowJobs, boolean fromRunFlow) {
-        this.jobIds = flowJobs.jobIds;
-        if (latestJob != null && latestJob.id != null && !this.jobIds.contains(latestJob.id)) {
-            this.jobIds.add(latestJob.id);
-            flowJobs.jobIds = this.jobIds;
-            flowJobs.latestJob = latestJob;
-            return;
-        }
-        if (fromRunFlow) {
-            //reset the latestJob info for until the running flow starts with a new jobId
-            flowJobs.latestJob = null;
+        if(flowJobs != null) {
+            this.jobIds = flowJobs.jobIds;
+            if (latestJob != null && latestJob.id != null && !this.jobIds.contains(latestJob.id)) {
+                this.jobIds.add(latestJob.id);
+                flowJobs.jobIds = this.jobIds;
+                flowJobs.latestJob = latestJob;
+                return;
+            }
+            if (fromRunFlow) {
+                //reset the latestJob info for until the running flow starts with a new jobId
+                flowJobs.latestJob = null;
+            }
+            this.latestJob = flowJobs.latestJob;
         }
-        this.latestJob = flowJobs.latestJob;
     }
 
     //for testing purpose

web/src/main/java/com/marklogic/hub/web/service/FlowJobService.java

@@ -38,19 +38,25 @@ public class FlowJobService extends ResourceManager {
 
     private DatabaseClient client;
 
-    //use a cache with ttl 30 minutes or longer to reduce frequency for fetching data from DB
+    //use a cache with ttl 5 minutes to reduce frequency for fetching data from DB
     public final Cache<String, FlowJobs> cachedJobsByFlowName = CacheBuilder.newBuilder().expireAfterWrite(
-        30, TimeUnit.MINUTES).build();
+        5, TimeUnit.MINUTES).build();
 
     public FlowJobService() {
         super();
+        if(hubConfig != null) {
+            this.setupClient();
+        }
     }
 
-    public void setupClient() {
+    private void setupClient() {
         this.client = hubConfig.newJobDbClient();
     }
 
     public FlowJobs getJobs(String flowName) {
+        if(this.client == null) {
+            this.setupClient();
+        }
         try {
             return cachedJobsByFlowName.get(flowName, () -> {
                 client.init(ML_JOBS_NAME, this);
@@ -144,11 +150,18 @@ public FlowJobs getJobs(String flowName) {
             if (cachedJobsByFlowName.getIfPresent(flowName) == null) {
                 cachedJobsByFlowName.invalidate(flowName);
             }
+            this.release();
         }
         return cachedJobsByFlowName.getIfPresent(flowName);
     }
-
-    public void release() {
-        this.client.release();
+    //TODO: fix this whole client mess and properly report exceptions
+    private void release() {
+        if(this.client != null) {
+            try {
+                this.client.release();
+            } catch (Exception e) {
+                this.client = null;
+            }
+        }
     }
 }

web/src/main/java/com/marklogic/hub/web/service/FlowManagerService.java

@@ -139,13 +139,11 @@ public FlowStepModel getFlow(String flowName, boolean fromRunFlow) {
     }
 
     private FlowStepModel getFlowStepModel(Flow flow, boolean fromRunFlow) {
-        flowJobService.setupClient();
         FlowStepModel fsm = FlowStepModel.transformFromFlow(flow);
         if (flowRunner.getRunningFlow() != null && flow.getName().equalsIgnoreCase(flowRunner.getRunningFlow().getName())) {
             fsm.setLatestJob(FlowRunnerChecker.getInstance(flowRunner).getLatestJob());
         }
         FlowJobs flowJobs = flowJobService.getJobs(flow.getName());
-        flowJobService.release();
         fsm.setJobs(flowJobs, fromRunFlow);
         return fsm;
     }