From 36050f4c9eae08e1cd68d9f44c2e2772380c8742 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 25 Nov 2010 14:12:24 +0000 Subject: [PATCH] Fix a couple of clustering issues: - Don't try and obtain session data from the cluster if the current node is the only node in the cluster. - Log requesting session data as INFO rather than WARNING. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1039051 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/ha/session/DeltaManager.java | 6 +++--- webapps/docs/changelog.xml | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java index de987a33a..ce738e400 100644 --- a/java/org/apache/catalina/ha/session/DeltaManager.java +++ b/java/org/apache/catalina/ha/session/DeltaManager.java @@ -802,7 +802,7 @@ public CatalinaCluster getCluster() { * @see #findSessionMasterMember() */ public synchronized void getAllClusterSessions() { - if (cluster != null && cluster.getMembers().length > 0) { + if (cluster != null && cluster.getMembers().length > 1) { long beforeSendTime = System.currentTimeMillis(); Member mbr = findSessionMasterMember(); if(mbr == null) { // No domain member found @@ -820,8 +820,8 @@ public CatalinaCluster getCluster() { receiverQueue = true ; } cluster.send(msg, mbr); - if (log.isWarnEnabled()) - log.warn(sm.getString("deltaManager.waitForSessionState",getName(), mbr, Integer.valueOf(getStateTransferTimeout()))); + if (log.isInfoEnabled()) + log.info(sm.getString("deltaManager.waitForSessionState",getName(), mbr, Integer.valueOf(getStateTransferTimeout()))); // FIXME At sender ack mode this method check only the state transfer and resend is a problem! waitForSendAllSessions(beforeSendTime); } finally { diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 954e0f8f0..0edd3d302 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -70,6 +70,11 @@ 50185: Add additional trace level logging to Tribes to assist with fault diagnosis. Based on a patch by Ariel. (markt) + + Don't try and obtain session data from the cluster if the current + node is the only node in the cluster. Log requesting session data as + INFO rather than WARNING. (markt) + -- 2.11.0