0002666: Cache offline node database parameters used by node

communication
JumpMind · Jul 2, 2016 · 482e3c0 · 482e3c0
1 parent 338745c
commit 482e3c0
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 16 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IParameterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IParameterService.java
@@ -72,6 +72,8 @@ public interface IParameterService {
 
     public TypedProperties getDatabaseParameters(String externalId, String nodeGroupId);
 
+    public List<DatabaseParameter> getOfflineNodeParameters();
+
     public TypedProperties getAllParameters();
 
     public boolean isRegistrationServer();

diff --git a/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java b/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java
@@ -144,21 +144,26 @@ public synchronized void rereadParameters() {
     }
 
     protected TypedProperties getParameters() {
-        if (parameters == null
-                || (cacheTimeoutInMs > 0 && lastTimeParameterWereCached < (System
-                        .currentTimeMillis() - cacheTimeoutInMs))) {
-            try {
-                parameters = rereadApplicationParameters();
-                lastTimeParameterWereCached = System.currentTimeMillis();
-                cacheTimeoutInMs = getInt(ParameterConstants.PARAMETER_REFRESH_PERIOD_IN_MS);
-            } catch (SqlException ex) {
-                if (parameters != null) {
-                    log.warn("Could not read database parameters.  We will try again later", ex);
-                } else {
-                    log.error("Could not read database parameters and they have not yet been initialized");
-                    throw ex;
+        long timeoutTime = System.currentTimeMillis() - cacheTimeoutInMs;
+        // Quick check if cache is timed out
+        if (parameters == null || (cacheTimeoutInMs > 0 && lastTimeParameterWereCached < timeoutTime)) {
+            synchronized (this) {
+                // Synchronized check to prevent calling reread parameters multiple times
+                if (parameters == null || (cacheTimeoutInMs > 0 && lastTimeParameterWereCached < timeoutTime)) {
+                    try {
+                        parameters = rereadApplicationParameters();
+                        lastTimeParameterWereCached = System.currentTimeMillis();
+                        cacheTimeoutInMs = getInt(ParameterConstants.PARAMETER_REFRESH_PERIOD_IN_MS);
+                    } catch (SqlException ex) {
+                        if (parameters != null) {
+                            log.warn("Could not read database parameters.  We will try again later", ex);
+                        } else {
+                            log.error("Could not read database parameters and they have not yet been initialized");
+                            throw ex;
+                        }
+                        throw ex;
+                    }
                 }
-                throw ex;
             }
         }
         return parameters;

diff --git a/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationService.java b/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationService.java
@@ -257,7 +257,7 @@ protected List<Node> removeOfflineNodes(List<Node> nodes) {
         if (parameterService.is(ParameterConstants.NODE_OFFLINE)) {
             nodes.clear();
         } else {
-            List<DatabaseParameter> parms = parameterService.getDatabaseParametersFor(ParameterConstants.NODE_OFFLINE);
+            List<DatabaseParameter> parms = parameterService.getOfflineNodeParameters();
             for (DatabaseParameter parm : parms) {
                 Iterator<Node> iter = nodes.iterator();
                 while (iter.hasNext()) {
@@ -284,7 +284,7 @@ protected List<Node> getNodesToCommunicateWithOffline(CommunicationType communic
                 nodesToCommunicateWith.addAll(nodeService.findNodesToPull());
             }
         } else {
-            List<DatabaseParameter> parms = parameterService.getDatabaseParametersFor(ParameterConstants.NODE_OFFLINE);
+            List<DatabaseParameter> parms = parameterService.getOfflineNodeParameters();
             nodesToCommunicateWith = new ArrayList<Node>(parms.size());
             if (parms.size() > 0) {
                 List<Node> sourceNodes = null;

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterService.java
@@ -52,6 +52,8 @@ public class ParameterService extends AbstractParameterService implements IParam
     private ISqlTemplate sqlTemplate;
 
     private Date lastUpdateTime;
+
+    private List<DatabaseParameter> offlineParameters;
 
     public ParameterService(IDatabasePlatform platform, ITypedPropertiesFactory factory, String tablePrefix) {
         this.tablePrefix = tablePrefix;
@@ -170,9 +172,14 @@ protected TypedProperties rereadApplicationParameters() {
         TypedProperties p = this.factory.reload();
         p.putAll(systemProperties);
         p.putAll(rereadDatabaseParameters(p));
+        rereadOfflineNodeParameters();
         return p;
     }
 
+    protected synchronized void rereadOfflineNodeParameters() {
+        offlineParameters = getDatabaseParametersFor(ParameterConstants.NODE_OFFLINE);
+    }
+
     public List<DatabaseParameter> getDatabaseParametersFor(String paramKey) {
         return sqlTemplate.query(sql.getSql("selectParametersByKeySql"),
                 new DatabaseParameterMapper(), paramKey);
@@ -182,6 +189,13 @@ public TypedProperties getDatabaseParameters(String externalId, String nodeGroup
         return readParametersFromDatabase("selectParametersSql", externalId, nodeGroupId);
     }
 
+    public List<DatabaseParameter> getOfflineNodeParameters() {
+        if (offlineParameters == null) {
+            rereadOfflineNodeParameters();
+        }
+        return offlineParameters;
+    }
+
     class DatabaseParameterMapper implements ISqlRowMapper<DatabaseParameter> {
         IParameterFilter filter = extensionService != null ? extensionService.getExtensionPoint(IParameterFilter.class) : null;
         public DatabaseParameter mapRow(Row row) {

diff --git a/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/MockParameterService.java b/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/MockParameterService.java
@@ -81,6 +81,10 @@ public TypedProperties getDatabaseParametersByNodeGroupId(String nodeGroupId) {
         return null;
     }
 
+    public List<DatabaseParameter> getOfflineNodeParameters() {
+        return null;
+    }
+
     public String getTablePrefix() {
         return "sym";
     }