more fixes for karyon3 server

tanyunpeng · Sep 21, 2015 · cc9afc2 · cc9afc2
1 parent fe98f31
commit cc9afc2
Show file tree

Hide file tree

Showing 17 changed files with 194 additions and 108 deletions.
diff --git a/eureka-core/src/main/java/com/netflix/eureka/EurekaBootStrap.java b/eureka-core/src/main/java/com/netflix/eureka/EurekaBootStrap.java
@@ -16,6 +16,7 @@
 
 package com.netflix.eureka;
 
+import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import java.util.Date;
@@ -88,11 +89,14 @@ public class EurekaBootStrap implements ServletContextListener {
      * @see
      * javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent)
      */
+    @Override
     public void contextInitialized(ServletContextEvent event) {
         try {
             initEurekaEnvironment();
             initEurekaServerContext();
 
+            ServletContext sc = event.getServletContext();
+            sc.setAttribute(EurekaServerContext.class.getName(), serverContext);
         } catch (Throwable e) {
             logger.error("Cannot bootstrap eureka server :", e);
             throw new RuntimeException("Cannot bootstrap eureka server :", e);
@@ -196,9 +200,13 @@ protected void initEurekaServerContext() throws Exception {
      *
      * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
      */
+    @Override
     public void contextDestroyed(ServletContextEvent event) {
         try {
             logger.info("{} Shutting down Eureka Server..", new Date().toString());
+            ServletContext sc = event.getServletContext();
+            sc.removeAttribute(EurekaServerContext.class.getName());
+
             destroyEurekaServerContext();
             destroyEurekaEnvironment();
 

diff --git a/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java b/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java
@@ -107,19 +107,24 @@ enum Target {FullFetch, DeltaFetch, Application, Other}
      */
     private static final RateLimiter registryFullFetchRateLimiter = new RateLimiter(TimeUnit.SECONDS);
 
-    private final EurekaServerConfig serverConfig;
+    private EurekaServerConfig serverConfig;
 
     @Inject
     public RateLimitingFilter(EurekaServerContext server) {
         this.serverConfig = server.getServerConfig();
     }
 
+    // for non-DI use
     public RateLimitingFilter() {
-        this(EurekaServerContextHolder.getInstance().getServerContext());
     }
 
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
+        if (serverConfig == null) {
+            EurekaServerContext serverContext = (EurekaServerContext) filterConfig.getServletContext()
+                    .getAttribute(EurekaServerContext.class.getName());
+            serverConfig = serverContext.getServerConfig();
+        }
     }
 
     @Override

diff --git a/eureka-core/src/main/java/com/netflix/eureka/ServerRequestAuthFilter.java b/eureka-core/src/main/java/com/netflix/eureka/ServerRequestAuthFilter.java
@@ -25,20 +25,24 @@ public class ServerRequestAuthFilter implements Filter {
 
     private static final String NAME_PREFIX = "DiscoveryServerRequestAuth_Name_";
 
-    private final EurekaServerConfig serverConfig;
+    private EurekaServerConfig serverConfig;
 
     @Inject
     public ServerRequestAuthFilter(EurekaServerContext server) {
         this.serverConfig = server.getServerConfig();
     }
 
+    // for non-DI use
     public ServerRequestAuthFilter() {
-        this(EurekaServerContextHolder.getInstance().getServerContext());
     }
 
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
-        // nothing to do here
+        if (serverConfig == null) {
+            EurekaServerContext serverContext = (EurekaServerContext) filterConfig.getServletContext()
+                    .getAttribute(EurekaServerContext.class.getName());
+            serverConfig = serverContext.getServerConfig();
+        }
     }
 
     @Override

diff --git a/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java b/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java
@@ -685,8 +685,8 @@ public Applications getApplicationsFromMultipleRegions(String[] remoteRegions) {
 
         boolean includeRemoteRegion = null != remoteRegions && remoteRegions.length != 0;
 
-        logger.info("Fetching applications registry with remote regions: {}, Regions argument {}", includeRemoteRegion,
-                Arrays.toString(remoteRegions));
+        logger.debug("Fetching applications registry with remote regions: {}, Regions argument {}",
+                includeRemoteRegion, Arrays.toString(remoteRegions));
 
         if (includeRemoteRegion) {
             GET_ALL_WITH_REMOTE_REGIONS_CACHE_MISS.increment();

diff --git a/eureka-core/src/main/java/com/netflix/eureka/registry/PeerAwareInstanceRegistryImpl.java b/eureka-core/src/main/java/com/netflix/eureka/registry/PeerAwareInstanceRegistryImpl.java
@@ -265,6 +265,8 @@ private void primeAwsReplicas(ApplicationInfoManager applicationInfoManager) {
                 Application eurekaApps = this.getApplication(applicationInfoManager.getInfo().getAppName(), false);
                 if (eurekaApps == null) {
                     areAllPeerNodesPrimed = true;
+                    logger.info("No peers needed to prime.");
+                    return;
                 }
                 for (PeerEurekaNode node : peerEurekaNodes.getPeerEurekaNodes()) {
                     for (InstanceInfo peerInstanceInfo : eurekaApps.getInstances()) {

diff --git a/eureka-core/src/main/java/com/netflix/eureka/registry/ResponseCacheImpl.java b/eureka-core/src/main/java/com/netflix/eureka/registry/ResponseCacheImpl.java
@@ -17,8 +17,6 @@
 package com.netflix.eureka.registry;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
@@ -75,7 +73,6 @@
  *
  * @author Karthik Ranganathan, Greg Kim
  */
-@Singleton
 public class ResponseCacheImpl implements ResponseCache {
 
     private static final Logger logger = LoggerFactory.getLogger(ResponseCacheImpl.class);
@@ -123,8 +120,7 @@ public List<Key> get() {
     private final EurekaServerConfig serverConfig;
     private final ServerCodecs serverCodecs;
 
-    @Inject
-    public ResponseCacheImpl(EurekaServerConfig serverConfig, ServerCodecs serverCodecs, AbstractInstanceRegistry registry) {
+    ResponseCacheImpl(EurekaServerConfig serverConfig, ServerCodecs serverCodecs, AbstractInstanceRegistry registry) {
         this.serverConfig = serverConfig;
         this.serverCodecs = serverCodecs;
         this.shouldUseReadOnlyResponseCache = serverConfig.shouldUseReadOnlyResponseCache();

diff --git a/eureka-core/src/main/java/com/netflix/eureka/resources/StatusResource.java b/eureka-core/src/main/java/com/netflix/eureka/resources/StatusResource.java
@@ -20,19 +20,13 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
-import java.net.URI;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.shared.Application;
 import com.netflix.eureka.EurekaServerContext;
 import com.netflix.eureka.EurekaServerContextHolder;
-import com.netflix.eureka.cluster.PeerEurekaNodes;
-import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
-import com.netflix.eureka.cluster.PeerEurekaNode;
 import com.netflix.eureka.util.StatusInfo;
-import com.netflix.eureka.util.StatusInfo.Builder;
+import com.netflix.eureka.util.StatusUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,15 +41,11 @@ public class StatusResource {
     private static final Logger logger = LoggerFactory.getLogger(StatusResource.class);
     private static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss Z";
 
-    private final String myAppName;
-    private final PeerAwareInstanceRegistry registry;
-    private final PeerEurekaNodes peerEurekaNodes;
+    private final StatusUtil statusUtil;
 
     @Inject
     StatusResource(EurekaServerContext server) {
-        this.myAppName = server.getApplicationInfoManager().getInfo().getAppName();
-        this.registry = server.getRegistry();
-        this.peerEurekaNodes = server.getPeerEurekaNodes();
+        this.statusUtil = new StatusUtil(server);
     }
 
     public StatusResource() {
@@ -64,47 +54,7 @@ public StatusResource() {
 
     @GET
     public StatusInfo getStatusInfo() {
-        Builder builder = Builder.newBuilder();
-        // Add application level status
-        StringBuilder upReplicas = new StringBuilder();
-        StringBuilder downReplicas = new StringBuilder();
-
-        StringBuilder replicaHostNames = new StringBuilder();
-
-        for (PeerEurekaNode node : peerEurekaNodes.getPeerEurekaNodes()) {
-            if (replicaHostNames.length() > 0) {
-                replicaHostNames.append(", ");
-            }
-            replicaHostNames.append(node.getServiceUrl());
-            if (isReplicaAvailable(myAppName, node.getServiceUrl())) {
-                upReplicas.append(node.getServiceUrl()).append(',');
-            } else {
-                downReplicas.append(node.getServiceUrl()).append(',');
-            }
-        }
-
-        builder.add("registered-replicas", replicaHostNames.toString());
-        builder.add("available-replicas", upReplicas.toString());
-        builder.add("unavailable-replicas", downReplicas.toString());
-
-        return builder.build();
-    }
-
-    private boolean isReplicaAvailable(String myAppName, String url) {
-
-        try {
-            String givenHostName = new URI(url).getHost();
-            Application app = registry.getApplication(myAppName, false);
-            for (InstanceInfo info : app.getInstances()) {
-                if (info.getHostName().equals(givenHostName)) {
-                    return true;
-                }
-            }
-            givenHostName = new URI(url).getHost();
-        } catch (Throwable e) {
-            logger.error("Could not determine if the replica is available ", e);
-        }
-        return false;
+        return statusUtil.getStatusInfo();
     }
 
     public static String getCurrentTimeAsString() {

diff --git a/eureka-core/src/main/java/com/netflix/eureka/util/StatusUtil.java b/eureka-core/src/main/java/com/netflix/eureka/util/StatusUtil.java
@@ -0,0 +1,73 @@
+package com.netflix.eureka.util;
+
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.discovery.shared.Application;
+import com.netflix.eureka.EurekaServerContext;
+import com.netflix.eureka.cluster.PeerEurekaNode;
+import com.netflix.eureka.cluster.PeerEurekaNodes;
+import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.URI;
+
+/**
+ * @author David Liu
+ */
+public class StatusUtil {
+    private static final Logger logger = LoggerFactory.getLogger(StatusUtil.class);
+
+    private final String myAppName;
+    private final PeerAwareInstanceRegistry registry;
+    private final PeerEurekaNodes peerEurekaNodes;
+
+    public StatusUtil(EurekaServerContext server) {
+        this.myAppName = server.getApplicationInfoManager().getInfo().getAppName();
+        this.registry = server.getRegistry();
+        this.peerEurekaNodes = server.getPeerEurekaNodes();
+    }
+
+    public StatusInfo getStatusInfo() {
+        StatusInfo.Builder builder = StatusInfo.Builder.newBuilder();
+        // Add application level status
+        StringBuilder upReplicas = new StringBuilder();
+        StringBuilder downReplicas = new StringBuilder();
+
+        StringBuilder replicaHostNames = new StringBuilder();
+
+        for (PeerEurekaNode node : peerEurekaNodes.getPeerEurekaNodes()) {
+            if (replicaHostNames.length() > 0) {
+                replicaHostNames.append(", ");
+            }
+            replicaHostNames.append(node.getServiceUrl());
+            if (isReplicaAvailable(myAppName, node.getServiceUrl())) {
+                upReplicas.append(node.getServiceUrl()).append(',');
+            } else {
+                downReplicas.append(node.getServiceUrl()).append(',');
+            }
+        }
+
+        builder.add("registered-replicas", replicaHostNames.toString());
+        builder.add("available-replicas", upReplicas.toString());
+        builder.add("unavailable-replicas", downReplicas.toString());
+
+        return builder.build();
+    }
+
+    private boolean isReplicaAvailable(String myAppName, String url) {
+
+        try {
+            String givenHostName = new URI(url).getHost();
+            Application app = registry.getApplication(myAppName, false);
+            for (InstanceInfo info : app.getInstances()) {
+                if (info.getHostName().equals(givenHostName)) {
+                    return true;
+                }
+            }
+            givenHostName = new URI(url).getHost();
+        } catch (Throwable e) {
+            logger.error("Could not determine if the replica is available ", e);
+        }
+        return false;
+    }
+}
diff --git a/eureka-resources/src/main/resources/jsp/header.jsp b/eureka-resources/src/main/resources/jsp/header.jsp
@@ -4,9 +4,11 @@
 <%@page import="com.netflix.appinfo.AmazonInfo.MetaDataKey"%>
 <div id="header">
   <%
-  InstanceInfo selfInstanceInfo = EurekaServerContextHolder.getInstance().getServerContext().getApplicationInfoManager().getInfo();
+  EurekaServerContext serverContext = (EurekaServerContext) pageContext.getServletContext()
+          .getAttribute(EurekaServerContext.class.getName());
+  InstanceInfo selfInstanceInfo = serverContext.getApplicationInfoManager().getInfo();
   DataCenterInfo info = selfInstanceInfo.getDataCenterInfo();
-  PeerAwareInstanceRegistry registry = EurekaServerContextHolder.getInstance().getServerContext().getRegistry();
+  PeerAwareInstanceRegistry registry =serverContext.getRegistry();
   AmazonInfo amazonInfo = null;
   if(info.getName() == DataCenterInfo.Name.Amazon) {
       amazonInfo = (AmazonInfo)info;

diff --git a/eureka-resources/src/main/resources/jsp/lastN.jsp b/eureka-resources/src/main/resources/jsp/lastN.jsp
@@ -37,7 +37,9 @@
 	</ul>
     <div id="tabs-1">
       <%
-      PeerAwareInstanceRegistry registry = EurekaServerContextHolder.getInstance().getServerContext().getRegistry();
+      EurekaServerContext serverContext = (EurekaServerContext) pageContext.getServletContext()
+              .getAttribute(EurekaServerContext.class.getName());
+      PeerAwareInstanceRegistry registry = serverContext.getRegistry();
       List<Pair<Long, String>> list = registry.getLastNCanceledInstances();
       out.print("<table id=\'lastNCanceled\' class=\"stripeable\">");
       out.print("<tr><th>Timestamp</th><th>Lease</th></tr>");

diff --git a/eureka-resources/src/main/resources/jsp/navbar.jsp b/eureka-resources/src/main/resources/jsp/navbar.jsp
@@ -10,7 +10,9 @@
   <dt> &nbsp;</dt> 
   <dd><b>DS Replicas: <b>
   <%
-   List<PeerEurekaNode> list = EurekaServerContextHolder.getInstance().getServerContext().getPeerEurekaNodes().getPeerNodesView();
+   EurekaServerContext serverContext = (EurekaServerContext) pageContext.getServletContext()
+          .getAttribute(EurekaServerContext.class.getName());
+   List<PeerEurekaNode> list = serverContext.getPeerEurekaNodes().getPeerNodesView();
    int i=0;
    for(PeerEurekaNode node : list){
      try{

diff --git a/eureka-resources/src/main/resources/jsp/status.jsp b/eureka-resources/src/main/resources/jsp/status.jsp
@@ -1,4 +1,7 @@
-<%@ page language="java" import="java.util.*,java.util.Map.Entry,com.netflix.discovery.shared.Pair,com.netflix.discovery.shared.*, com.netflix.eureka.util.*,com.netflix.appinfo.InstanceInfo.*, com.netflix.appinfo.DataCenterInfo.*,com.netflix.appinfo.AmazonInfo.MetaDataKey,com.netflix.eureka.resources.*,com.netflix.eureka.*,com.netflix.appinfo.*" pageEncoding="UTF-8" %>
+<%@ page language="java" import="java.util.*,java.util.Map.Entry,com.netflix.discovery.shared.Pair,
+com.netflix.discovery.shared.*,com.netflix.eureka.util.*,com.netflix.appinfo.InstanceInfo.*,
+com.netflix.appinfo.DataCenterInfo.*,com.netflix.appinfo.AmazonInfo.MetaDataKey,com.netflix.eureka.resources.*,
+com.netflix.eureka.*,com.netflix.appinfo.*,com.netflix.eureka.util.StatusUtil" pageEncoding="UTF-8" %>
 <%
 String path = request.getContextPath();
 String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
@@ -44,7 +47,9 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
            <tfoot><tr><th>Application</th><th>AMIs</th><th>Availability Zones</th><th>Status</th></tr></tfoot>
            <tbody>
            <%
-           for(Application app : EurekaServerContextHolder.getInstance().getServerContext().getRegistry().getSortedApplications()) {
+           EurekaServerContext serverContext = (EurekaServerContext) pageContext.getServletContext()
+                   .getAttribute(EurekaServerContext.class.getName());
+           for(Application app : serverContext.getRegistry().getSortedApplications()) {
                out.print("<tr><td><b>" + app.getName() + "</b></td>");
                Map<String, Integer> amiCounts = new HashMap<String, Integer>();
                Map<InstanceStatus,List<Pair<String, String>>> instancesByStatus =
@@ -138,7 +143,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
       <table id='generalInfo' class="stripeable">
           <tr><th>Name</th><th>Value</th></tr>
            <%
-           StatusInfo statusInfo = (new StatusResource()).getStatusInfo();
+           StatusInfo statusInfo = (new StatusUtil(serverContext)).getStatusInfo();
            Map<String,String> genMap = statusInfo.getGeneralStats();
            for (Map.Entry<String,String> entry : genMap.entrySet()) {
              out.print("<tr>");

diff --git a/eureka-server-karyon3/build.gradle b/eureka-server-karyon3/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'war'
 apply plugin: 'jetty'
 
 dependencies {
-    compile project(':eureka-client')
     compile project(':eureka-core')
     runtime 'xerces:xercesImpl:2.4.0'
     compile "com.netflix.governator:governator:1.10.0"
@@ -29,7 +28,6 @@ task copyLibs(type: Copy) {
 }
 
 war {
-    archiveName 'eureka.war'
     from (project(':eureka-resources').file('build/resources/main'))
 }