重入读写分离锁改成高性能缓存Caffeine组件来代替

README.md

@@ -262,7 +262,7 @@ http://IP:[management.port]/config/send
 ```java
 Java:
 @RequestMapping(path = "view", method = RequestMethod.GET)
-public ResponseEntity<String> view()
+public ResponseEntity<?> view()
 
 Url:
 http://IP:[management.port]/config/view

discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/ConfigEndpoint.java

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
@@ -46,7 +47,7 @@ public class ConfigEndpoint implements MvcEndpoint {
     private PluginPublisher pluginPublisher;
 
     @Autowired
-    private RuleEntity ruleEntity;
+    private RuleCache ruleCache;
 
     // 推送规则配置信息
     @RequestMapping(path = "send", method = RequestMethod.POST)
@@ -76,7 +77,12 @@ public class ConfigEndpoint implements MvcEndpoint {
     @RequestMapping(path = "view", method = RequestMethod.GET)
     @ResponseBody
     @ManagedOperation
-    public ResponseEntity<String> view() {
+    public ResponseEntity<?> view() {
+        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        if (ruleEntity == null) {
+            return new ResponseEntity<>(Collections.singletonMap("Message", "No config to view"), HttpStatus.OK);
+        }
+
         String content = ruleEntity.getContent();
 
         return ResponseEntity.ok().body(content);

discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/ConfigParser.java

@@ -15,7 +15,6 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -27,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.nepxion.discovery.plugin.configcenter.constant.ConfigConstant;
 import com.nepxion.discovery.plugin.configcenter.xml.Dom4JParser;
+import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 import com.nepxion.discovery.plugin.framework.config.PluginConfigParser;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.CountEntity;
@@ -44,10 +44,7 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
     private static final Logger LOG = LoggerFactory.getLogger(ConfigParser.class);
 
     @Autowired
-    private RuleEntity ruleEntity;
-
-    @Autowired
-    private ReentrantReadWriteLock reentrantReadWriteLock;
+    private RuleCache ruleCache;
 
     @Override
     public void parse(InputStream inputStream) {
@@ -99,15 +96,13 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
         }
 
         String text = getText();
-        try {
-            reentrantReadWriteLock.writeLock().lock();
 
-            ruleEntity.setRegisterEntity(registerEntity);
-            ruleEntity.setDiscoveryEntity(discoveryEntity);
-            ruleEntity.setContent(text);
-        } finally {
-            reentrantReadWriteLock.writeLock().unlock();
-        }
+        RuleEntity ruleEntity = new RuleEntity();
+        ruleEntity.setRegisterEntity(registerEntity);
+        ruleEntity.setDiscoveryEntity(discoveryEntity);
+        ruleEntity.setContent(text);
+
+        ruleCache.put(PluginConstant.RULE, ruleEntity);
 
         LOG.info("Rule entity=\n{}", ruleEntity);
     }

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/cache/RuleCache.java

+package com.nepxion.discovery.plugin.framework.cache;
+
+/**
+ * <p>Title: Nepxion Discovery</p>
+ * <p>Description: Nepxion Discovery</p>
+ * <p>Copyright: Copyright (c) 2017-2050</p>
+ * <p>Company: Nepxion</p>
+ * @author Haojun Ren
+ * @version 1.0
+ */
+
+import java.util.concurrent.TimeUnit;
+
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
+
+public class RuleCache {
+    private LoadingCache<String, RuleEntity> loadingCache;
+
+    public RuleCache() {
+        loadingCache = Caffeine.newBuilder()
+                .expireAfterWrite(365 * 100, TimeUnit.DAYS)
+                .initialCapacity(1)
+                .maximumSize(1)
+                .recordStats()
+                .build(new CacheLoader<String, RuleEntity>() {
+                    @Override
+                    public RuleEntity load(String key) throws Exception {
+                        return null;
+                    }
+                });
+    }
+
+    public boolean put(String key, RuleEntity ruleEntity) {
+        loadingCache.put(key, ruleEntity);
+
+        return Boolean.TRUE;
+    }
+
+    public RuleEntity get(String key) {
+        try {
+            return loadingCache.get(key);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public boolean clear(String key) {
+        loadingCache.invalidate(key);
+
+        return Boolean.TRUE;
+    }
+}
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/configuration/PluginAutoConfiguration.java

@@ -9,15 +9,13 @@ package com.nepxion.discovery.plugin.framework.configuration;
  * @version 1.0
  */
 
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import com.nepxion.discovery.plugin.framework.cache.PluginCache;
+import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 import com.nepxion.discovery.plugin.framework.context.PluginContainerInitializedHandler;
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
-import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.event.PluginPublisher;
 import com.nepxion.discovery.plugin.framework.event.PluginSubscriber;
 import com.nepxion.discovery.plugin.framework.listener.discovery.DiscoveryListenerExecutor;
@@ -58,13 +56,8 @@ public class PluginAutoConfiguration {
     }
 
     @Bean
-    public RuleEntity ruleEntity() {
-        return new RuleEntity();
-    }
-
-    @Bean
-    public ReentrantReadWriteLock reentrantReadWriteLock() {
-        return new ReentrantReadWriteLock();
+    public RuleCache ruleCache() {
+        return new RuleCache();
     }
 
     @Bean

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/configuration/PluginLoadBalanceConfiguration.java

@@ -53,8 +53,8 @@ public class PluginLoadBalanceConfiguration {
         return loadBalancer;
     }
 
-    @Bean
-    public ServerListUpdater ribbonServerListUpdater(IClientConfig config) {
-        return new PollingServerListUpdaterDecorator(config);
-    }
+//    @Bean
+//    public ServerListUpdater ribbonServerListUpdater(IClientConfig config) {
+//        return new PollingServerListUpdaterDecorator(config);
+//    }
 }
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/constant/PluginConstant.java

@@ -22,6 +22,7 @@ public class PluginConstant {
     public static final String HOST = "host";
     public static final String PORT = "port";
     public static final String INSTANCES = "instances";
+    public static final String RULE = "rule";
     public static final String REACH_MAX_LIMITED_COUNT = "reach max limited count";
 
     public static final String ENCODING_UTF_8 = "UTF-8";

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/discovery/DiscoveryListenerExecutor.java

@@ -10,7 +10,6 @@ package com.nepxion.discovery.plugin.framework.listener.discovery;
  */
 
 import java.util.List;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
@@ -26,23 +25,14 @@ public class DiscoveryListenerExecutor {
     @Autowired
     private List<DiscoveryListener> discoveryListenerList;
 
-    @Autowired
-    private ReentrantReadWriteLock reentrantReadWriteLock;
-
     public void onGetInstances(String serviceId, List<ServiceInstance> instances) {
-        try {
-            reentrantReadWriteLock.readLock().lock();
-
-            ipAddressFilterDiscoveryListener.onGetInstances(serviceId, instances);
-            versionFilterDiscoveryListener.onGetInstances(serviceId, instances);
+        ipAddressFilterDiscoveryListener.onGetInstances(serviceId, instances);
+        versionFilterDiscoveryListener.onGetInstances(serviceId, instances);
 
-            for (DiscoveryListener discoveryListener : discoveryListenerList) {
-                if (discoveryListener != ipAddressFilterDiscoveryListener && discoveryListener != versionFilterDiscoveryListener) {
-                    discoveryListener.onGetInstances(serviceId, instances);
-                }
+        for (DiscoveryListener discoveryListener : discoveryListenerList) {
+            if (discoveryListener != ipAddressFilterDiscoveryListener && discoveryListener != versionFilterDiscoveryListener) {
+                discoveryListener.onGetInstances(serviceId, instances);
             }
-        } finally {
-            reentrantReadWriteLock.readLock().unlock();
         }
     }
 

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/discovery/IpAddressFilterDiscoveryListener.java

@@ -18,6 +18,8 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
 
+import com.nepxion.discovery.plugin.framework.cache.RuleCache;
+import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterType;
@@ -25,7 +27,7 @@ import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 
 public class IpAddressFilterDiscoveryListener extends AbstractDiscoveryListener {
     @Autowired
-    private RuleEntity ruleEntity;
+    private RuleCache ruleCache;
 
     @Override
     public void onGetInstances(String serviceId, List<ServiceInstance> instances) {
@@ -33,6 +35,11 @@ public class IpAddressFilterDiscoveryListener extends AbstractDiscoveryListener
     }
 
     private void applyIpAddressFilter(String providerServiceId, List<ServiceInstance> instances) {
+        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        if (ruleEntity == null) {
+            return;
+        }
+
         DiscoveryEntity discoveryEntity = ruleEntity.getDiscoveryEntity();
         if (discoveryEntity == null) {
             return;

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/discovery/VersionFilterDiscoveryListener.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
 
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
+import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
@@ -29,7 +30,7 @@ import com.nepxion.discovery.plugin.framework.entity.VersionEntity;
 
 public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
     @Autowired
-    private RuleEntity ruleEntity;
+    private RuleCache ruleCache;
 
     @Autowired
     private PluginAdapter pluginAdapter;
@@ -48,6 +49,11 @@ public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
             return;
         }
 
+        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        if (ruleEntity == null) {
+            return;
+        }
+
         DiscoveryEntity discoveryEntity = ruleEntity.getDiscoveryEntity();
         if (discoveryEntity == null) {
             return;

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/loadbalance/IpAddressFilterLoadBalanceListener.java

@@ -17,6 +17,8 @@ import java.util.Map;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.nepxion.discovery.plugin.framework.cache.RuleCache;
+import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterType;
@@ -25,7 +27,7 @@ import com.netflix.loadbalancer.Server;
 
 public class IpAddressFilterLoadBalanceListener extends AbstractLoadBalanceListener {
     @Autowired
-    private RuleEntity ruleEntity;
+    private RuleCache ruleCache;
 
     @Override
     public void onGetServers(String serviceId, List<? extends Server> servers) {
@@ -33,6 +35,11 @@ public class IpAddressFilterLoadBalanceListener extends AbstractLoadBalanceListe
     }
 
     private void applyIpAddressFilter(String providerServiceId, List<? extends Server> servers) {
+        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        if (ruleEntity == null) {
+            return;
+        }
+
         DiscoveryEntity discoveryEntity = ruleEntity.getDiscoveryEntity();
         if (discoveryEntity == null) {
             return;

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/loadbalance/LoadBalanceListenerExecutor.java

@@ -10,7 +10,6 @@ package com.nepxion.discovery.plugin.framework.listener.loadbalance;
  */
 
 import java.util.List;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -25,20 +24,11 @@ public class LoadBalanceListenerExecutor {
     @Autowired
     private VersionFilterLoadBalanceListener versionFilterLoadBalanceListener;
 
-    @Autowired
-    private ReentrantReadWriteLock reentrantReadWriteLock;
-
     private ZoneAwareLoadBalancer<?> loadBalancer;
 
     public void onGetServers(String serviceId, List<? extends Server> servers) {
-        try {
-            reentrantReadWriteLock.readLock().lock();
-
-            ipAddressFilterLoadBalanceListener.onGetServers(serviceId, servers);
-            versionFilterLoadBalanceListener.onGetServers(serviceId, servers);
-        } finally {
-            reentrantReadWriteLock.readLock().unlock();
-        }
+        ipAddressFilterLoadBalanceListener.onGetServers(serviceId, servers);
+        versionFilterLoadBalanceListener.onGetServers(serviceId, servers);
     }
 
     public ZoneAwareLoadBalancer<?> getLoadBalancer() {

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/loadbalance/VersionFilterLoadBalanceListener.java

@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
+import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
@@ -29,7 +30,7 @@ import com.netflix.loadbalancer.Server;
 
 public class VersionFilterLoadBalanceListener extends AbstractLoadBalanceListener {
     @Autowired
-    private RuleEntity ruleEntity;
+    private RuleCache ruleCache;
 
     @Autowired
     private PluginAdapter pluginAdapter;
@@ -48,6 +49,11 @@ public class VersionFilterLoadBalanceListener extends AbstractLoadBalanceListene
             return;
         }
 
+        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        if (ruleEntity == null) {
+            return;
+        }
+
         DiscoveryEntity discoveryEntity = ruleEntity.getDiscoveryEntity();
         if (discoveryEntity == null) {
             return;

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/register/CountFilterRegisterListener.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.serviceregistry.Registration;
 
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
+import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.decorator.DiscoveryClientDecorator;
 import com.nepxion.discovery.plugin.framework.entity.CountEntity;
@@ -26,7 +27,7 @@ import com.nepxion.discovery.plugin.framework.exception.PluginException;
 
 public class CountFilterRegisterListener extends AbstractRegisterListener {
     @Autowired
-    private RuleEntity ruleEntity;
+    private RuleCache ruleCache;
 
     @Autowired
     private PluginAdapter pluginAdapter;
@@ -47,6 +48,11 @@ public class CountFilterRegisterListener extends AbstractRegisterListener {
     }
 
     private void applyCountFilter(String serviceId, String ipAddress, int port) {
+        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        if (ruleEntity == null) {
+            return;
+        }
+
         RegisterEntity registerEntity = ruleEntity.getRegisterEntity();
         if (registerEntity == null) {
             return;
@@ -81,7 +87,7 @@ public class CountFilterRegisterListener extends AbstractRegisterListener {
 
     private void onRegisterFailure(int maxCount, String serviceId, String ipAddress, int port) {
         String description = ipAddress + " isn't allowed to register to Register server, reach max limited count=" + maxCount;
-        
+
         Boolean registerFailureEventEnabled = environment.getProperty(PluginConstant.SPRING_APPLICATION_REGISTER_FAILURE_EVENT_ENABLED, Boolean.class, Boolean.FALSE);
         if (registerFailureEventEnabled) {
             pluginPublisher.asyncPublish(new RegisterFailureEvent(PluginConstant.REACH_MAX_LIMITED_COUNT, description, serviceId, ipAddress, port));

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/register/IpAddressFilterRegisterListener.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.serviceregistry.Registration;
 
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
+import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.FilterEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterType;
@@ -29,7 +30,7 @@ import com.nepxion.discovery.plugin.framework.exception.PluginException;
 
 public class IpAddressFilterRegisterListener extends AbstractRegisterListener {
     @Autowired
-    private RuleEntity ruleEntity;
+    private RuleCache ruleCache;
 
     @Autowired
     private PluginAdapter pluginAdapter;
@@ -47,6 +48,11 @@ public class IpAddressFilterRegisterListener extends AbstractRegisterListener {
     }
 
     private void applyIpAddressFilter(String serviceId, String ipAddress, int port) {
+        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        if (ruleEntity == null) {
+            return;
+        }
+
         RegisterEntity registerEntity = ruleEntity.getRegisterEntity();
         if (registerEntity == null) {
             return;

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/register/RegisterListenerExecutor.java

@@ -10,7 +10,6 @@ package com.nepxion.discovery.plugin.framework.listener.register;
  */
 
 import java.util.List;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.serviceregistry.Registration;
@@ -26,24 +25,15 @@ public class RegisterListenerExecutor {
     @Autowired
     private List<RegisterListener> registerListenerList;
 
-    @Autowired
-    private ReentrantReadWriteLock reentrantReadWriteLock;
-
     public void onRegister(Registration registration) {
-        try {
-            reentrantReadWriteLock.readLock().lock();
-
-            for (RegisterListener registerListener : registerListenerList) {
-                if (registerListener != countFilterRegisterListener && registerListener != ipAddressFilterRegisterListener) {
-                    registerListener.onRegister(registration);
-                }
+        for (RegisterListener registerListener : registerListenerList) {
+            if (registerListener != countFilterRegisterListener && registerListener != ipAddressFilterRegisterListener) {
+                registerListener.onRegister(registration);
             }
-
-            countFilterRegisterListener.onRegister(registration);
-            ipAddressFilterRegisterListener.onRegister(registration);
-        } finally {
-            reentrantReadWriteLock.readLock().unlock();
         }
+
+        countFilterRegisterListener.onRegister(registration);
+        ipAddressFilterRegisterListener.onRegister(registration);
     }
 
     public void onDeregister(Registration registration) {