[jbossweb-commits] JBossWeb SVN: r1962 - in trunk: webapps/docs and 1 other directory.

Author: remy.maucherat(a)jboss.com Date: 2012-02-13 18:08:49 -0500 (Mon, 13 Feb 2012) New Revision: 1962 Modified: trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java trunk/webapps/docs/changelog.xml Log: Sync memory leaks listener, just in case. Modified: trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java =================================================================== --- trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java 2012-02-13 18:25:41 UTC (rev 1961) +++ trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java 2012-02-13 23:08:49 UTC (rev 1962) @@ -18,9 +18,13 @@ package org.apache.catalina.core; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; +import java.sql.DriverManager; +import java.util.StringTokenizer; import javax.imageio.ImageIO; import javax.xml.parsers.DocumentBuilderFactory; @@ -43,7 +47,7 @@ * <p> * Locked files usually occur when a resource inside a JAR is accessed without * first disabling Jar URL connection caching. The workaround is to disable this - * caching by default. + * caching by default. */ public class JreMemoryLeakPreventionListener implements LifecycleListener { @@ -57,19 +61,101 @@ * <code>sun.awt.AppContext.getAppContext()</code> is triggered by a web * application. Defaults to <code>true</code>. */ - protected boolean appContextProtection = true; + private boolean appContextProtection = true; public boolean isAppContextProtection() { return appContextProtection; } public void setAppContextProtection(boolean appContextProtection) { this.appContextProtection = appContextProtection; } /** + * Protect against the memory leak caused when the first call to + * <code>java.awt.Toolkit.getDefaultToolkit()</code> is triggered + * by a web application. Defaults to <code>false</code> because a new + * Thread is launched. + */ + private boolean awtThreadProtection = false; + public boolean isAWTThreadProtection() { return awtThreadProtection; } + public void setAWTThreadProtection(boolean awtThreadProtection) { + this.awtThreadProtection = awtThreadProtection; + } + + /** + * Protect against the memory leak caused when the + * <code>sun.java2d.Disposer</code> class is loaded by a web application. + * Defaults to <code>false</code> because a new Thread is launched. + */ + private boolean java2dDisposerProtection = false; + public boolean isJava2DDisposerProtection() { + return java2dDisposerProtection; + } + public void setJava2DDisposerProtection(boolean java2dDisposerProtection) { + this.java2dDisposerProtection = java2dDisposerProtection; + } + + /** + * Protect against the memory leak caused when the first call to + * <code>sun.misc.GC.requestLatency(long)</code> is triggered by a web + * application. This first call will start a GC Daemon thread with the + * thread's context class loader configured to be the web application class + * loader. Defaults to <code>true</code>. + */ + private boolean gcDaemonProtection = true; + public boolean isGcDaemonProtection() { return gcDaemonProtection; } + public void setGcDaemonProtection(boolean gcDaemonProtection) { + this.gcDaemonProtection = gcDaemonProtection; + } + + /** + * Protect against the memory leak caused when the first call to + * <code>javax.security.auth.Policy</code> is triggered by a web + * application. This first call populate a static variable with a reference + * to the context class loader. Defaults to <code>true</code>. + */ + private boolean securityPolicyProtection = true; + public boolean isSecurityPolicyProtection() { + return securityPolicyProtection; + } + public void setSecurityPolicyProtection(boolean securityPolicyProtection) { + this.securityPolicyProtection = securityPolicyProtection; + } + + /** + * Protects against the memory leak caused when the first call to + * <code>javax.security.auth.login.Configuration</code> is triggered by a + * web application. This first call populate a static variable with a + * reference to the context class loader. Defaults to <code>true</code>. + */ + private boolean securityLoginConfigurationProtection = true; + public boolean isSecurityLoginConfigurationProtection() { + return securityLoginConfigurationProtection; + } + public void setSecurityLoginConfigurationProtection( + boolean securityLoginConfigurationProtection) { + this.securityLoginConfigurationProtection = securityLoginConfigurationProtection; + } + + /** + * Protect against the memory leak, when the initialization of the + * Java Cryptography Architecture is triggered by initializing + * a MessageDigest during web application deployment. + * This will occasionally start a Token Poller thread with the thread's + * context class loader equal to the web application class loader. + * Instead we initialize JCA early. + * Defaults to <code>true</code>. + */ + private boolean tokenPollerProtection = true; + public boolean isTokenPollerProtection() { return tokenPollerProtection; } + public void setTokenPollerProtection(boolean tokenPollerProtection) { + this.tokenPollerProtection = tokenPollerProtection; + } + + /** * Protect against resources being read for JAR files and, as a side-effect, * the JAR file becoming locked. Note this disables caching for all * {@link URLConnection}s, regardless of type. Defaults to * <code>true</code>. */ - protected boolean urlCacheProtection = true; + private boolean urlCacheProtection = true; public boolean isUrlCacheProtection() { return urlCacheProtection; } public void setUrlCacheProtection(boolean urlCacheProtection) { this.urlCacheProtection = urlCacheProtection; @@ -77,82 +163,295 @@ /** * XML parsing can pin a web application class loader in memory. This is - * particularly nasty as profilers (at least YourKit and Eclispe MAT) don't - * idenitfy any GC roots related to this. + * particularly nasty as profilers (at least YourKit and Eclipse MAT) don't + * identify any GC roots related to this. + * <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6916498&quo... + * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6916498</a> */ - protected boolean xmlParsingProtection = true; + private boolean xmlParsingProtection = true; public boolean isXmlParsingProtection() { return xmlParsingProtection; } public void setXmlParsingProtection(boolean xmlParsingProtection) { this.xmlParsingProtection = xmlParsingProtection; } - + + /** + * <code>com.sun.jndi.ldap.LdapPoolManager</code> class spawns a thread when + * it is initialized if the system property + * <code>com.sun.jndi.ldap.connect.pool.timeout</code> is greater than 0. + * That thread inherits the context class loader of the current thread, so + * that there may be a web application class loader leak if the web app + * is the first to use <code>LdapPoolManager</code>. + */ + private boolean ldapPoolProtection = true; + public boolean isLdapPoolProtection() { return ldapPoolProtection; } + public void setLdapPoolProtection(boolean ldapPoolProtection) { + this.ldapPoolProtection = ldapPoolProtection; + } + + /** + * The first access to {@link DriverManager} will trigger the loading of + * all {@link java.sql.Driver}s in the the current class loader. The web + * application level memory leak protection can take care of this in most + * cases but triggering the loading here has fewer side-effects. + */ + private boolean driverManagerProtection = true; + public boolean isDriverManagerProtection() { + return driverManagerProtection; + } + public void setDriverManagerProtection(boolean driverManagerProtection) { + this.driverManagerProtection = driverManagerProtection; + } + + /** + * List of comma-separated fully qualified class names to load and initialize during + * the startup of this Listener. This allows to pre-load classes that are known to + * provoke classloader leaks if they are loaded during a request processing. + */ + private String classesToInitialize = null; + public String getClassesToInitialize() { + return classesToInitialize; + } + public void setClassesToInitialize(String classesToInitialize) { + this.classesToInitialize = classesToInitialize; + } + + @Override public void lifecycleEvent(LifecycleEvent event) { // Initialise these classes when Tomcat starts if (Lifecycle.INIT_EVENT.equals(event.getType())) { - /* - * Several components end up calling: - * sun.awt.AppContext.getAppContext() - * - * Those libraries / components known to trigger memory leaks due to - * eventual calls to getAppContext() are: - * - Google Web Toolkit via its use of javax.imageio - * - Tomcat via its use of java.beans.Introspector.flushCaches() in - * 1.6.0_15 onwards - * - others TBD - */ - - // Trigger a call to sun.awt.AppContext.getAppContext(). This will - // pin the common class loader in memory but that shouldn't be an - // issue. - if (appContextProtection) { - ImageIO.getCacheDirectory(); - } - - /* - * Several components end up opening JarURLConnections without first - * disabling caching. This effectively locks the file. Whilst more - * noticeable and harder to ignore on Windows, it affects all - * operating systems. - * - * Those libraries/components known to trigger this issue include: - * - log4j versions 1.2.15 and earlier - * - javax.xml.bind.JAXBContext.newInstance() - */ - - // Set the default URL caching policy to not to cache - if (urlCacheProtection) { - try { - // Doesn't matter that this JAR doesn't exist - just as long as - // the URL is well-formed - URL url = new URL("jar:file://dummy.jar!/"); - URLConnection uConn = url.openConnection(); - uConn.setDefaultUseCaches(false); - } catch (MalformedURLException e) { - log.error(sm.getString( - "jreLeakListener.jarUrlConnCacheFail"), e); - } catch (IOException e) { - log.error(sm.getString( - "jreLeakListener.jarUrlConnCacheFail"), e); + + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + + try + { + // Use the system classloader as the victim for all this + // ClassLoader pinning we're about to do. + Thread.currentThread().setContextClassLoader( + ClassLoader.getSystemClassLoader()); + + /* + * First call to this loads all drivers in the current class + * loader + */ + if (driverManagerProtection) { + DriverManager.getDrivers(); } - } - - /* - * Haven't got to the root of what is going on with this leak but if - * a web app is the first to make the calls below the web - * application class loader will be pinned in memory. - */ - if (xmlParsingProtection) { - DocumentBuilderFactory factory = - DocumentBuilderFactory.newInstance(); - try { - factory.newDocumentBuilder(); - } catch (ParserConfigurationException e) { - log.error(sm.getString( - "jreLeakListener.xmlParseFail"), e); + + /* + * Several components end up calling: + * sun.awt.AppContext.getAppContext() + * + * Those libraries / components known to trigger memory leaks + * due to eventual calls to getAppContext() are: + * - Google Web Toolkit via its use of javax.imageio + * - Tomcat via its use of java.beans.Introspector.flushCaches() + * in 1.6.0_15 onwards + * - others TBD + */ + + // Trigger a call to sun.awt.AppContext.getAppContext(). This + // will pin the system class loader in memory but that shouldn't + // be an issue. + if (appContextProtection) { + ImageIO.getCacheDirectory(); } + + // Trigger the creation of the AWT (AWT-Windows, AWT-XAWT, + // etc.) thread + if (awtThreadProtection) { + java.awt.Toolkit.getDefaultToolkit(); + } + + // Trigger the creation of the "Java2D Disposer" thread. + // See https://issues.apache.org/bugzilla/show_bug.cgi?id=51687 + if(java2dDisposerProtection) { + try { + Class.forName("sun.java2d.Disposer"); + } + catch (ClassNotFoundException cnfe) { + // Ignore this case: we must be running on a + // non-Sun-based JRE. + } + } + + /* + * Several components end up calling: + * sun.misc.GC.requestLatency(long) + * + * Those libraries / components known to trigger memory leaks + * due to eventual calls to requestLatency(long) are: + * - javax.management.remote.rmi.RMIConnectorServer.start() + */ + if (gcDaemonProtection) { + try { + Class<?> clazz = Class.forName("sun.misc.GC"); + Method method = clazz.getDeclaredMethod( + "requestLatency", + new Class[] {long.class}); + method.invoke(null, Long.valueOf(3600000)); + } catch (ClassNotFoundException e) { + if (System.getProperty("java.vendor").startsWith( + "Sun")) { + log.error(sm.getString( + "jreLeakListener.gcDaemonFail"), e); + } else { + log.debug(sm.getString( + "jreLeakListener.gcDaemonFail"), e); + } + } catch (SecurityException e) { + log.error(sm.getString("jreLeakListener.gcDaemonFail"), + e); + } catch (NoSuchMethodException e) { + log.error(sm.getString("jreLeakListener.gcDaemonFail"), + e); + } catch (IllegalArgumentException e) { + log.error(sm.getString("jreLeakListener.gcDaemonFail"), + e); + } catch (IllegalAccessException e) { + log.error(sm.getString("jreLeakListener.gcDaemonFail"), + e); + } catch (InvocationTargetException e) { + log.error(sm.getString("jreLeakListener.gcDaemonFail"), + e); + } + } + + /* + * Calling getPolicy retains a static reference to the context + * class loader. + */ + if (securityPolicyProtection) { + try { + // Policy.getPolicy(); + Class<?> policyClass = Class + .forName("javax.security.auth.Policy"); + Method method = policyClass.getMethod("getPolicy"); + method.invoke(null); + } catch(ClassNotFoundException e) { + // Ignore. The class is deprecated. + } catch(SecurityException e) { + // Ignore. Don't need call to getPolicy() to be + // successful, just need to trigger static initializer. + } catch (NoSuchMethodException e) { + log.warn(sm.getString("jreLeakListener.authPolicyFail"), + e); + } catch (IllegalArgumentException e) { + log.warn(sm.getString("jreLeakListener.authPolicyFail"), + e); + } catch (IllegalAccessException e) { + log.warn(sm.getString("jreLeakListener.authPolicyFail"), + e); + } catch (InvocationTargetException e) { + log.warn(sm.getString("jreLeakListener.authPolicyFail"), + e); + } + } + + + /* + * Initializing javax.security.auth.login.Configuration retains a static reference to the context + * class loader. + */ + if (securityLoginConfigurationProtection) { + try { + Class.forName("javax.security.auth.login.Configuration", true, ClassLoader.getSystemClassLoader()); + } catch(ClassNotFoundException e) { + // Ignore + } + } + + /* + * Creating a MessageDigest during web application startup + * initializes the Java Cryptography Architecture. Under certain + * conditions this starts a Token poller thread with TCCL equal + * to the web application class loader. + * + * Instead we initialize JCA right now. + */ + if (tokenPollerProtection) { + java.security.Security.getProviders(); + } + + /* + * Several components end up opening JarURLConnections without + * first disabling caching. This effectively locks the file. + * Whilst more noticeable and harder to ignore on Windows, it + * affects all operating systems. + * + * Those libraries/components known to trigger this issue + * include: + * - log4j versions 1.2.15 and earlier + * - javax.xml.bind.JAXBContext.newInstance() + */ + + // Set the default URL caching policy to not to cache + if (urlCacheProtection) { + try { + // Doesn't matter that this JAR doesn't exist - just as + // long as the URL is well-formed + URL url = new URL("jar:file://dummy.jar!/"); + URLConnection uConn = url.openConnection(); + uConn.setDefaultUseCaches(false); + } catch (MalformedURLException e) { + log.error(sm.getString( + "jreLeakListener.jarUrlConnCacheFail"), e); + } catch (IOException e) { + log.error(sm.getString( + "jreLeakListener.jarUrlConnCacheFail"), e); + } + } + + /* + * Haven't got to the root of what is going on with this leak + * but if a web app is the first to make the calls below the web + * application class loader will be pinned in memory. + */ + if (xmlParsingProtection) { + DocumentBuilderFactory factory = + DocumentBuilderFactory.newInstance(); + try { + factory.newDocumentBuilder(); + } catch (ParserConfigurationException e) { + log.error(sm.getString("jreLeakListener.xmlParseFail"), + e); + } + } + + if (ldapPoolProtection) { + try { + Class.forName("com.sun.jndi.ldap.LdapPoolManager"); + } catch (ClassNotFoundException e) { + if (System.getProperty("java.vendor").startsWith( + "Sun")) { + log.error(sm.getString( + "jreLeakListener.ldapPoolManagerFail"), e); + } else { + log.debug(sm.getString( + "jreLeakListener.ldapPoolManagerFail"), e); + } + } + } + + if (classesToInitialize != null) { + StringTokenizer strTok = + new StringTokenizer(classesToInitialize, ", \r\n\t"); + while (strTok.hasMoreTokens()) { + String classNameToLoad = strTok.nextToken(); + try { + Class.forName(classNameToLoad); + } catch (ClassNotFoundException e) { + log.error( + sm.getString("jreLeakListener.classToInitializeFail", + classNameToLoad), e); + // continue with next class to load + } + } + } + + } finally { + Thread.currentThread().setContextClassLoader(loader); } } } - } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2012-02-13 18:25:41 UTC (rev 1961) +++ trunk/webapps/docs/changelog.xml 2012-02-13 23:08:49 UTC (rev 1962) @@ -17,6 +17,13 @@ <body> <section name="JBoss Web 7.0.11.Final (remm)"> + <subsection name="Catalina"> + <changelog> + <fix> + Sync memory leak hacks listener. (markt) + </fix> + </changelog> + </subsection> <subsection name="Coyote"> <changelog> <fix>