You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/05/16 14:04:54 UTC
[tomcat] branch 8.5.x updated (c7095ae -> 5a71bda)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from c7095ae Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63403
new c013959 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63441
new 0395c11 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 poss deadlock
new 5a71bda Avoid unnecessary logging when host is down
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/catalina/ha/session/DeltaManager.java | 26 ++++++++---
.../apache/catalina/ha/session/DeltaSession.java | 52 ++++++++++++++--------
.../group/interceptors/TcpFailureDetector.java | 5 +--
webapps/docs/changelog.xml | 27 +++++++++++
4 files changed, 82 insertions(+), 28 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Avoid unnecessary logging when host is down
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5a71bda53c8eb34d65015ab87faad272d0837e18
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 16 13:54:25 2019 +0100
Avoid unnecessary logging when host is down
---
.../tribes/group/interceptors/TcpFailureDetector.java | 5 ++---
webapps/docs/changelog.xml | 11 +++++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
index 2220f20..3faba6f 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
@@ -19,6 +19,7 @@ package org.apache.catalina.tribes.group.interceptors;
import java.net.ConnectException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
+import java.net.NoRouteToHostException;
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.util.Arrays;
@@ -353,9 +354,7 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
}
}//end if
return true;
- } catch (SocketTimeoutException sx) {
- //do nothing, we couldn't connect
- } catch (ConnectException cx) {
+ } catch (SocketTimeoutException | ConnectException | NoRouteToHostException noop) {
//do nothing, we couldn't connect
} catch (Exception x) {
log.error(sm.getString("tcpFailureDetector.failureDetection.failed", mbr),x);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0bef7b7..eb4edf6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -88,6 +88,17 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Tribes">
+ <changelog>
+ <fix>
+ Treat <code>NoRouteToHostException</code> the same way as
+ <code>SocketTimeoutException</code> when checking the health of group
+ members. This avoids a SEVERE log message every time the check is
+ performed when the host associated with a group member is not powered
+ on. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Fix
https://bz.apache.org/bugzilla/show_bug.cgi?id=63441
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c013959ed35fdd58ba8f9f4709b6e225d53e2fe8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 16 10:48:17 2019 +0100
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63441
Further streamline the processing of session creation messages in the
DeltaManager to reduce the possibility of a session update message being
processed before the session has been created.
---
.../apache/catalina/ha/session/DeltaManager.java | 5 +++-
.../apache/catalina/ha/session/DeltaSession.java | 32 ++++++++++------------
webapps/docs/changelog.xml | 10 +++++++
3 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java
index 321193b..065e5af 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -474,13 +474,16 @@ public class DeltaManager extends ClusterManagerBase{
*/
@Override
public Session createEmptySession() {
- return getNewDeltaSession() ;
+ return new DeltaSession(this);
}
/**
* Get new session class to be used in the doLoad() method.
* @return a new session
+ *
+ * @deprecated Unused. This will be removed in Tomcat 10.
*/
+ @Deprecated
protected DeltaSession getNewDeltaSession() {
return new DeltaSession(this);
}
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java
index 3e375f3..231b1be 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -101,7 +101,9 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
*/
public DeltaSession(Manager manager) {
super(manager);
- this.resetDeltaRequest();
+ boolean recordAllActions = manager instanceof ClusterManagerBase &&
+ ((ClusterManagerBase)manager).isRecordAllActions();
+ deltaRequest = new DeltaRequest(getIdInternal(), recordAllActions);
}
// ----------------------------------------------------- ReplicatedMapEntry
@@ -291,7 +293,7 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
public void setMaxInactiveInterval(int interval, boolean addDeltaRequest) {
super.maxInactiveInterval = interval;
- if (addDeltaRequest && (deltaRequest != null)) {
+ if (addDeltaRequest) {
lock();
try {
deltaRequest.setMaxInactiveInterval(interval);
@@ -314,7 +316,7 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
public void setNew(boolean isNew, boolean addDeltaRequest) {
super.setNew(isNew);
- if (addDeltaRequest && (deltaRequest != null)){
+ if (addDeltaRequest){
lock();
try {
deltaRequest.setNew(isNew);
@@ -342,7 +344,7 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
lock();
try {
super.setPrincipal(principal);
- if (addDeltaRequest && (deltaRequest != null))
+ if (addDeltaRequest)
deltaRequest.setPrincipal(principal);
} finally {
unlock();
@@ -364,8 +366,9 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
lock();
try {
super.setAuthType(authType);
- if (addDeltaRequest && (deltaRequest != null))
+ if (addDeltaRequest) {
deltaRequest.setAuthType(authType);
+ }
} finally {
unlock();
}
@@ -510,7 +513,7 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
lock();
try {
super.addSessionListener(listener);
- if (addDeltaRequest && deltaRequest != null && listener instanceof ReplicatedSessionListener) {
+ if (addDeltaRequest && listener instanceof ReplicatedSessionListener) {
deltaRequest.addSessionListener(listener);
}
} finally {
@@ -527,7 +530,7 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
lock();
try {
super.removeSessionListener(listener);
- if (addDeltaRequest && deltaRequest != null && listener instanceof ReplicatedSessionListener) {
+ if (addDeltaRequest && listener instanceof ReplicatedSessionListener) {
deltaRequest.removeSessionListener(listener);
}
} finally {
@@ -592,21 +595,14 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
public void resetDeltaRequest() {
lock();
try {
- if (deltaRequest == null) {
- boolean recordAllActions = manager instanceof ClusterManagerBase &&
- ((ClusterManagerBase)manager).isRecordAllActions();
- deltaRequest = new DeltaRequest(getIdInternal(), recordAllActions);
- } else {
- deltaRequest.reset();
- deltaRequest.setSessionId(getIdInternal());
- }
+ deltaRequest.reset();
+ deltaRequest.setSessionId(getIdInternal());
} finally{
unlock();
}
}
public DeltaRequest getDeltaRequest() {
- if (deltaRequest == null) resetDeltaRequest();
return deltaRequest;
}
@@ -682,7 +678,7 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
lock();
try {
super.setAttribute(name,value, notify);
- if (addDeltaRequest && deltaRequest != null && !exclude(name, value)) {
+ if (addDeltaRequest && !exclude(name, value)) {
deltaRequest.setAttribute(name, value);
}
} finally {
@@ -881,7 +877,7 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
if (value == null) return;
super.removeAttributeInternal(name,notify);
- if (addDeltaRequest && deltaRequest != null && !exclude(name, null)) {
+ if (addDeltaRequest && !exclude(name, null)) {
deltaRequest.removeAttribute(name);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 51daa4b..522757a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -72,6 +72,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ <bug>63441</bug>: Further streamline the processing of session creation
+ messages in the <code>DeltaManager</code> to reduce the possibility of a
+ session update message being processed before the session has been
+ created. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Fix
https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 poss deadlock
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0395c11daf0775e0ef6ac1dbeb0abe7a2083200d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 16 13:36:39 2019 +0100
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 poss deadlock
Refactor the DeltaRequest serialization to reduce the window during
which the DeltaSession is locked and to remove a potential cause of
deadlocks during serialization.
---
.../apache/catalina/ha/session/DeltaManager.java | 21 +++++++++++++++------
.../apache/catalina/ha/session/DeltaSession.java | 20 ++++++++++++++++++++
webapps/docs/changelog.xml | 6 ++++++
3 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java
index 065e5af..45588ae 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -39,6 +39,7 @@ import org.apache.catalina.tribes.io.ReplicationStream;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.collections.SynchronizedStack;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -93,7 +94,8 @@ public class DeltaManager extends ClusterManagerBase{
new ArrayList<>();
private boolean receiverQueue = false ;
private boolean stateTimestampDrop = true ;
- private long stateTransferCreateSendTime;
+ private volatile long stateTransferCreateSendTime;
+ private SynchronizedStack<DeltaRequest> deltaRequestPool = new SynchronizedStack<>();
// -------------------------------------------------------- stats attributes
@@ -960,10 +962,10 @@ public class DeltaManager extends ClusterManagerBase{
* whether this method has been called during session expiration
* @return a SessionMessage to be sent,
*/
- @SuppressWarnings("null") // session can't be null when it is used
public ClusterMessage requestCompleted(String sessionId, boolean expires) {
DeltaSession session = null;
SessionMessage msg = null;
+ DeltaRequest deltaRequest = null;
try {
session = (DeltaSession) findSession(sessionId);
if (session == null) {
@@ -971,8 +973,12 @@ public class DeltaManager extends ClusterManagerBase{
// removed the session from the Manager.
return null;
}
- DeltaRequest deltaRequest = session.getDeltaRequest();
- session.lock();
+ DeltaRequest newDeltaRequest = deltaRequestPool.pop();
+ if (newDeltaRequest == null) {
+ // Will be configured in replaceDeltaRequest()
+ newDeltaRequest = new DeltaRequest();
+ }
+ deltaRequest = session.replaceDeltaRequest(newDeltaRequest);
if (deltaRequest.getSize() > 0) {
counterSend_EVT_SESSION_DELTA++;
byte[] data = serializeDeltaRequest(session,deltaRequest);
@@ -981,14 +987,17 @@ public class DeltaManager extends ClusterManagerBase{
data,
sessionId,
sessionId + "-" + System.currentTimeMillis());
- session.resetDeltaRequest();
}
} catch (IOException x) {
log.error(sm.getString("deltaManager.createMessage.unableCreateDeltaRequest",
sessionId), x);
return null;
} finally {
- if (session!=null) session.unlock();
+ if (deltaRequest != null) {
+ // Reset the instance before it is returned to the pool
+ deltaRequest.reset();
+ deltaRequestPool.push(deltaRequest);
+ }
}
if(msg == null) {
if(!expires && !session.isPrimarySession()) {
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java
index 231b1be..7604ebd 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -606,6 +606,26 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
return deltaRequest;
}
+ /**
+ * Replace the existing deltaRequest with the provided replacement.
+ *
+ * @param deltaRequest The new deltaRequest. Expected to be either a newly
+ * created object or an instance that has been reset.
+ *
+ * @return The old deltaRequest
+ */
+ DeltaRequest replaceDeltaRequest(DeltaRequest deltaRequest) {
+ lock();
+ try {
+ DeltaRequest oldDeltaRequest = this.deltaRequest;
+ this.deltaRequest = deltaRequest;
+ this.deltaRequest.setSessionId(getIdInternal());
+ return oldDeltaRequest;
+ } finally {
+ unlock();
+ }
+ }
+
// ------------------------------------------------- HttpSession Properties
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 522757a..0bef7b7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -75,6 +75,12 @@
<subsection name="Cluster">
<changelog>
<fix>
+ <bug>62841</bug>: Refactor the <code>DeltaRequest</code> serialization
+ to reduce the window during which the <code>DeltaSession</code> is
+ locked and to remove a potential cause of deadlocks during
+ serialization. (markt)
+ </fix>
+ <fix>
<bug>63441</bug>: Further streamline the processing of session creation
messages in the <code>DeltaManager</code> to reduce the possibility of a
session update message being processed before the session has been
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org