Author: markt
Date: Wed Nov 17 17:37:19 2010
New Revision: 1036129
URL: http://svn.apache.org/viewvc?rev=1036129&view=rev
Log:
Session manager performance
Switch to only allowing changes to randomFile to take effect when the Manager
next starts. This will simplify replacing RandomIS with a queue which is the
next step in improving Manager performance on non-Windows platforms
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1036129&r1=1036128&r2=1036129&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Wed Nov
17 17:37:19 2010
@@ -203,6 +203,7 @@ public class BackupManager extends Clust
cluster.removeManager(this);
this.randoms.clear();
+ super.stopInternal();
}
@Override
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1036129&r1=1036128&r2=1036129&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Wed Nov
17 17:37:19 2010
@@ -959,8 +959,9 @@ public CatalinaCluster getCluster() {
}
// Require a new random number generator if we are restarted
- this.randoms.clear();
getCluster().removeManager(this);
+ this.randoms.clear();
+ super.stopInternal();
replicationValve = null;
}
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1036129&r1=1036128&r2=1036129&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Wed Nov 17
17:37:19 2010
@@ -77,8 +77,9 @@ public abstract class ManagerBase extend
// ----------------------------------------------------- Instance Variables
protected volatile InputStream randomIS = null;
- protected volatile String randomFile = "/dev/urandom";
- protected volatile boolean randomFileIsValid = true;
+ protected String randomFile = "/dev/urandom";
+ protected String randomFileCurrent = null;
+ protected volatile boolean randomFileCurrentIsValid = true;
/**
* The default message digest algorithm to use if we cannot use
@@ -252,30 +253,26 @@ public abstract class ManagerBase extend
// ------------------------------------------------------------- Security
classes
- private class PrivilegedSetRandomFile implements PrivilegedAction<Void> {
-
- public PrivilegedSetRandomFile(String s) {
- randomFile = s;
- }
+ private class PrivilegedCreateRandomIS implements PrivilegedAction<Void> {
@Override
public Void run(){
try {
- File f = new File(randomFile);
+ File f = new File(randomFileCurrent);
if (!f.exists()) {
- randomFileIsValid = false;
+ randomFileCurrentIsValid = false;
closeRandomFile();
return null;
}
InputStream is = new FileInputStream(f);
is.read();
if( log.isDebugEnabled() )
- log.debug( "Opening " + randomFile );
+ log.debug( "Opening " + randomFileCurrent );
randomIS = is;
- randomFileIsValid = true;
+ randomFileCurrentIsValid = true;
} catch (IOException ex){
- log.warn("Error reading " + randomFile, ex);
- randomFileIsValid = false;
+ log.warn("Error reading " + randomFileCurrent, ex);
+ randomFileCurrentIsValid = false;
closeRandomFile();
}
return null;
@@ -567,39 +564,66 @@ public abstract class ManagerBase extend
* visible on the first call to getSession ( like in the first JSP )
* - so use it if available.
*/
- public synchronized void setRandomFile( String s ) {
+ public void setRandomFile(String s) {
// as a hack, you can use a static file - and generate the same
// session ids ( good for strange debugging )
+ randomFile = s;
+ }
+
+ protected void createRandomIS() {
if (Globals.IS_SECURITY_ENABLED){
- AccessController.doPrivileged(new PrivilegedSetRandomFile(s));
+ AccessController.doPrivileged(new PrivilegedCreateRandomIS());
} else {
try{
- randomFile = s;
- File f = new File(randomFile);
+ File f = new File(randomFileCurrent);
if (!f.exists()) {
- randomFileIsValid = false;
+ randomFileCurrentIsValid = false;
closeRandomFile();
return;
}
InputStream is = new FileInputStream(f);
is.read();
if( log.isDebugEnabled() )
- log.debug( "Opening " + randomFile );
+ log.debug( "Opening " + randomFileCurrent );
randomIS = is;
- randomFileIsValid = true;
+ randomFileCurrentIsValid = true;
} catch( IOException ex ) {
- log.warn("Error reading " + randomFile, ex);
- randomFileIsValid = false;
+ log.warn("Error reading " + randomFileCurrent, ex);
+ randomFileCurrentIsValid = false;
closeRandomFile();
}
}
}
+
+ /**
+ * Obtain the value of the randomFile attribute currently configured for
+ * this Manager. Note that this will not return the same value as
+ * {...@link #getRandomFileCurrent()} if the value for the randomFile
attribute
+ * has been changed since this Manager was started.
+ *
+ * @return The file currently configured to provide random data for use in
+ * generating session IDs
+ */
public String getRandomFile() {
return randomFile;
}
+ /**
+ * Obtain the value of the randomFile attribute currently being used by
+ * this Manager. Note that this will not return the same value as
+ * {...@link #getRandomFile()} if the value for the randomFile attribute
has
+ * been changed since this Manager was started.
+ *
+ * @return The file currently being used to provide random data for use in
+ * generating session IDs
+ */
+ public String getRandomFileCurrent() {
+ return randomFileCurrent;
+ }
+
+
protected synchronized void closeRandomFile() {
if (randomIS != null) {
try {
@@ -825,6 +849,10 @@ public abstract class ManagerBase extend
@Override
protected void startInternal() throws LifecycleException {
+
+ randomFileCurrent = randomFile;
+ createRandomIS();
+
// Force initialization of the random number generator
if (log.isDebugEnabled())
log.debug("Force random number initialization starting");
@@ -834,11 +862,11 @@ public abstract class ManagerBase extend
}
@Override
- protected void destroyInternal() throws LifecycleException {
+ protected void stopInternal() throws LifecycleException {
closeRandomFile();
- super.destroyInternal();
}
-
+
+
/**
* Add this Session to the set of active Sessions for this Manager.
*
@@ -1009,14 +1037,6 @@ public abstract class ManagerBase extend
protected void getRandomBytes(byte bytes[]) {
- // Generate a byte array containing a session identifier
- if (randomFileIsValid && randomIS == null) {
- synchronized (this) {
- if (randomFileIsValid && randomIS == null) {
- setRandomFile(randomFile);
- }
- }
- }
if (randomIS != null) {
try {
// If randomIS is set to null by a call to setRandomFile that
@@ -1035,7 +1055,7 @@ public abstract class ManagerBase extend
} catch (Exception ex) {
// Ignore
}
- randomFileIsValid = false;
+ randomFileCurrentIsValid = false;
closeRandomFile();
}
Random random = randoms.poll();
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1036129&r1=1036128&r2=1036129&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Wed Nov 17 17:37:19 2010
@@ -866,6 +866,7 @@ public abstract class PersistentManagerB
// Require a new random number generator if we are restarted
this.randoms.clear();
+ super.stopInternal();
}
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1036129&r1=1036128&r2=1036129&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Wed Nov
17 17:37:19 2010
@@ -514,6 +514,7 @@ public class StandardManager extends Man
// Require a new random number generator if we are restarted
this.randoms.clear();
+ super.stopInternal();
}
Modified: tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml?rev=1036129&r1=1036128&r2=1036129&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml Wed
Nov 17 17:37:19 2010
@@ -116,9 +116,14 @@
type="java.lang.String"/>
<attribute name="randomFile"
- description="File source of random - /dev/urandom or a pipe"
+ description="File source of random - /dev/urandom or a pipe that
will be used when the Manager is next started"
type="java.lang.String"/>
+ <attribute name="randomFileCurrent"
+ description="File source of random - /dev/urandom or a pipe
currently being used"
+ type="java.lang.String"
+ writeable="false"/>
+
<attribute name="randomClass"
description="The random number generator class name"
type="java.lang.String"/>
Modified: tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java?rev=1036129&r1=1036128&r2=1036129&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java (original)
+++ tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java Wed Nov 17
17:37:19 2010
@@ -42,7 +42,7 @@ public class Benchmarks extends TestCase
* 4 threads - ~32,500ms
* 16 threads - ~132,000ms
*/
- public void testManagerBaseGenerateSessionId() {
+ public void testManagerBaseGenerateSessionId() throws Exception {
doTestManagerBaseGenerateSessionId(1, 1000000);
doTestManagerBaseGenerateSessionId(1, 1000000);
doTestManagerBaseGenerateSessionId(1, 1000000);
@@ -57,10 +57,15 @@ public class Benchmarks extends TestCase
public void doTestManagerBaseGenerateSessionId(int threadCount,
- int iterCount) {
+ int iterCount) throws Exception {
// Create a default session manager
StandardManager mgr = new StandardManager();
+ // Calling start requires a valid container so do the equivalent
+ mgr.randomFileCurrent = mgr.randomFile;
+ mgr.createRandomIS();
+ mgr.generateSessionId();
+
Thread[] threads = new Thread[threadCount];
@@ -138,7 +143,11 @@ public class Benchmarks extends TestCase
// Create a default session manager
StandardManager mgr = new StandardManager();
mgr.setContainer(new StandardContext());
-
+ // Calling start requires a valid container so do the equivalent
+ mgr.randomFileCurrent = mgr.randomFile;
+ mgr.createRandomIS();
+ mgr.generateSessionId();
+
Thread[] threads = new Thread[threadCount];
for (int i = 0; i < threadCount; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
