Author: kfujino
Date: Wed Nov 6 08:58:35 2013
New Revision: 1539277
URL: http://svn.apache.org/r1539277
Log:
Remove unnecessary sleep when sending session blocks on session sync phase.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1539277&r1=1539276&r2=1539277&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Wed Nov 6 08:58:35 2013
@@ -1434,12 +1434,14 @@ public class DeltaManager extends Cluste
sendSessions(sender, currentSessions, findSessionTimestamp);
} else {
// send session at blocks
+ int remain = currentSessions.length;
for (int i = 0; i < currentSessions.length; i +=
getSendAllSessionsSize()) {
int len = i + getSendAllSessionsSize() >
currentSessions.length ? currentSessions.length - i : getSendAllSessionsSize();
Session[] sendSessions = new Session[len];
System.arraycopy(currentSessions, i, sendSessions, 0, len);
sendSessions(sender, sendSessions,findSessionTimestamp);
- if (getSendAllSessionsWaitTime() > 0) {
+ remain = remain - len;
+ if (getSendAllSessionsWaitTime() > 0 && remain > 0) {
try {
Thread.sleep(getSendAllSessionsWaitTime());
} catch (Exception sleep) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1539277&r1=1539276&r2=1539277&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Nov 6 08:58:35 2013
@@ -170,6 +170,10 @@
Correct stop failure log of cluster. Failure cause is not only Valve.
(kfujino)
</fix>
+ <fix>
+ Remove unnecessary sleep when sending session blocks on session sync
+ phase. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
