Revision: 15702
Author: [email protected]
Date: Fri Dec 10 04:56:47 2010
Log: Fixes Issue 1875
http://code.google.com/p/mobicents/source/detail?r=15702
Modified:
/trunk/servers/cluster/timers/src/main/java/org/mobicents/timers/FaultTolerantScheduler.java
/trunk/servers/cluster/timers/src/main/java/org/mobicents/timers/SetTimerAfterTxCommitRunnable.java
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/ClusteredSipApplicationSession.java
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/ClusteredSipServletTimerService.java
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/FaultTolerantSasTimerService.java
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/FaultTolerantTimerServiceImpl.java
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/SipApplicationSessionTaskFactory.java
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/TimerServiceTaskFactory.java
=======================================
---
/trunk/servers/cluster/timers/src/main/java/org/mobicents/timers/FaultTolerantScheduler.java
Thu Dec 9 10:49:05 2010
+++
/trunk/servers/cluster/timers/src/main/java/org/mobicents/timers/FaultTolerantScheduler.java
Fri Dec 10 04:56:47 2010
@@ -355,17 +355,6 @@
// on recovery the task will already be in the cache so we don't check
for it
// or an IllegalStateException will be thrown
schedule(task, false);
- } else {
- if (logger.isDebugEnabled()) {
- logger.debug("Not Recovering task with id "+taskData.getTaskID() + "
since the factory returned a null task");
- }
- task = localRunningTasks.get(taskData.getTaskID());
- if(task == null) {
- if (logger.isDebugEnabled()) {
- logger.debug("Task with task id "+taskData.getTaskID() + " is not
present locally neither, removing it from the cache");
- }
- remove(taskData.getTaskID(), true);
- }
}
}
@@ -474,8 +463,15 @@
*/
@SuppressWarnings("unchecked")
public void dataRemoved(Fqn clusteredCacheDataFqn) {
- final TimerTask task =
localRunningTasks.remove(clusteredCacheDataFqn.getLastElement());
+ Object lastElement =
clusteredCacheDataFqn.getLastElement();
+ if (logger.isDebugEnabled()) {
+ logger.debug("remote notification dataRemoved( clusterCacheDataFqn
= "+clusteredCacheDataFqn+"), lastElement " + lastElement);
+ }
+ final TimerTask task =
localRunningTasks.remove(lastElement);
if (task != null) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("remote notification dataRemoved( task
= "+task.getData().getTaskID()+" removed locally cancelling it");
+ }
task.cancel();
}
}
=======================================
---
/trunk/servers/cluster/timers/src/main/java/org/mobicents/timers/SetTimerAfterTxCommitRunnable.java
Thu Nov 18 09:02:41 2010
+++
/trunk/servers/cluster/timers/src/main/java/org/mobicents/timers/SetTimerAfterTxCommitRunnable.java
Fri Dec 10 04:56:47 2010
@@ -59,7 +59,12 @@
if (!canceled) {
- scheduler.getLocalRunningTasksMap().put(task.getData().getTaskID(),
task);
+ TimerTask previousTask =
scheduler.getLocalRunningTasksMap().putIfAbsent(task.getData().getTaskID(),
task);
+ if(previousTask != null) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("A task with id " + task.getData().getTaskID() + " has
already been added to the local tasks, not rescheduling");
+ }
+ }
final TimerTaskData taskData = task.getData();
// calculate delay
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/ClusteredSipApplicationSession.java
Thu Dec 9 10:49:05 2010
+++
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/ClusteredSipApplicationSession.java
Fri Dec 10 04:56:47 2010
@@ -1469,12 +1469,16 @@
public void rescheduleTimersLocally() {
((ClusteredSipApplicationSessionTimerService)sipContext.getSipApplicationSessionTimerService()).rescheduleTimerLocally(this);
if(servletTimerIds != null) {
- if(logger.isInfoEnabled()) {
- logger.info("SipApplicationSession " + key + " number of servletTimers
to reschedule locally " + servletTimerIds.length);
+ if(logger.isDebugEnabled()) {
+ logger.debug("SipApplicationSession " + key + " number of
servletTimers to reschedule locally " + servletTimerIds.length);
}
for(String servletTimerId : servletTimerIds) {
-
((ClusteredSipServletTimerService)sipContext.getTimerService()).rescheduleTimerLocally(this,
servletTimerId);
+ ServletTimer servletTimer =
((ClusteredSipServletTimerService)sipContext.getTimerService()).rescheduleTimerLocally(this,
servletTimerId);
+ if(servletTimer != null) {
+ super.addServletTimer(servletTimer);
+ }
}
}
+ servletTimerIds = null;
}
}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/ClusteredSipServletTimerService.java
Thu Dec 9 08:01:47 2010
+++
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/ClusteredSipServletTimerService.java
Fri Dec 10 04:56:47 2010
@@ -21,6 +21,8 @@
*/
package org.jboss.web.tomcat.service.session;
+import javax.servlet.sip.ServletTimer;
+
import
org.mobicents.servlet.sip.core.session.MobicentsSipApplicationSession;
import org.mobicents.servlet.sip.core.timers.SipServletTimerService;
@@ -30,6 +32,6 @@
*/
public interface ClusteredSipServletTimerService extends
SipServletTimerService {
- void rescheduleTimerLocally(MobicentsSipApplicationSession
sipApplicationSession, String timerId);
+ ServletTimer rescheduleTimerLocally(MobicentsSipApplicationSession
sipApplicationSession, String timerId);
}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/FaultTolerantSasTimerService.java
Thu Dec 9 10:49:05 2010
+++
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/FaultTolerantSasTimerService.java
Fri Dec 10 04:56:47 2010
@@ -180,8 +180,8 @@
FaultTolerantSasTimerTask faultTolerantSasTimerTask = new
FaultTolerantSasTimerTask(sipApplicationSession, timerTaskData);
sipApplicationSession.setExpirationTimerTask(faultTolerantSasTimerTask);
if(timerTaskData != null) {
- if(logger.isInfoEnabled()) {
- logger.info("Task for sip application session " + taskId + " is not
present locally, but on another node, rescheduling it locally.");
+ if(logger.isDebugEnabled()) {
+ logger.debug("Task for sip application session " + taskId + " is not
present locally, but on another node, cancelling the remote one and
rescheduling it locally.");
}
// we cancel it, this will cause the remote owner node to remove it
and cancel its local task
getScheduler().cancel(taskId);
@@ -190,10 +190,9 @@
// and reschedule it locally
getScheduler().schedule(faultTolerantSasTimerTask);
} else {
- if(logger.isInfoEnabled()) {
- logger.info("Task for sip application session " + taskId + " is not
present locally, nor on another node, rescheduling it.");
- }
-
getScheduler().schedule(faultTolerantSasTimerTask);
+ if(logger.isDebugEnabled()) {
+ logger.debug("Task for sip application session " + taskId + " is not
present locally, nor on another node, nothing can be done.");
+ }
}
} else {
if(logger.isInfoEnabled()) {
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/FaultTolerantTimerServiceImpl.java
Thu Dec 9 10:49:05 2010
+++
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/FaultTolerantTimerServiceImpl.java
Fri Dec 10 04:56:47 2010
@@ -209,7 +209,7 @@
* (non-Javadoc)
* @see
org.jboss.web.tomcat.service.session.ClusteredSipServletTimerService#rescheduleTimerLocally(org.mobicents.servlet.sip.core.session.MobicentsSipApplicationSession,
java.lang.String)
*/
- public void rescheduleTimerLocally(MobicentsSipApplicationSession
sipApplicationSession, String timerId) {
+ public ServletTimer rescheduleTimerLocally(MobicentsSipApplicationSession
sipApplicationSession, String timerId) {
TimerTask timerTask =
getScheduler().getLocalRunningTask(timerId);
if(timerTask == null) {
TimerServiceTaskData timerTaskData = (TimerServiceTaskData)
getScheduler().getTimerTaskData(timerId);
@@ -218,8 +218,8 @@
TimerServiceTask timerServiceTask = new TimerServiceTask(sipManager,
servletTimerImpl, timerTaskData);
if(timerTaskData != null) {
- if(logger.isInfoEnabled()) {
- logger.info("Task " + timerId + " is not present locally, but on
another node, rescheduling it locally.");
+ if(logger.isDebugEnabled()) {
+ logger.debug("Task " + timerId + " is not present locally, but on
another node, cancelling the remote one and rescheduling it locally.");
}
// we cancel it, this will cause the remote owner node to remove it
and cancel its local task
getScheduler().cancel(timerId);
@@ -228,16 +228,18 @@
// and reschedule it locally
getScheduler().schedule(timerServiceTask);
} else {
- if(logger.isInfoEnabled()) {
- logger.info("Task " + timerId + " is not present locally, nor on
another node, rescheduling it.");
+ if(logger.isDebugEnabled()) {
+ logger.debug("Task " + timerId + " is not present locally, nor on
another node, rescheduling it.");
}
// and reschedule it locally
getScheduler().schedule(timerServiceTask);
}
+ return timerServiceTask;
} else {
if(logger.isInfoEnabled()) {
logger.info("Task " + timerId + " is already present locally no need
to reschedule it.");
}
+ return null;
}
}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/SipApplicationSessionTaskFactory.java
Thu Dec 9 10:49:05 2010
+++
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/SipApplicationSessionTaskFactory.java
Fri Dec 10 04:56:47 2010
@@ -53,20 +53,23 @@
public TimerTask newTimerTask(TimerTaskData data) {
SipApplicationSessionTaskData sasData =
(SipApplicationSessionTaskData)data;
MobicentsSipApplicationSession sipApplicationSession =
sipManager.getSipApplicationSession(sasData.getKey(), false);
-
if(((SipContext)sipManager.getContainer()).getConcurrencyControlMode() !=
ConcurrencyControlMode.SipApplicationSession) {
- if(logger.isDebugEnabled()) {
- if(sipApplicationSession == null) {
- logger.debug("sip application session for key " + sasData.getKey()
+ " was not found neither locally or in the cache, sas expiration timer
recreation will be problematic");
- } else {
- logger.debug("sip application session for key " + sasData.getKey()
+ " was found");
- }
- }
- FaultTolerantSasTimerTask faultTolerantSasTimerTask = new
FaultTolerantSasTimerTask(sipApplicationSession, sasData);
- if(sipApplicationSession != null) {
-
sipApplicationSession.setExpirationTimerTask(faultTolerantSasTimerTask);
- }
- return faultTolerantSasTimerTask;
- }
+ if(sipApplicationSession.getExpirationTimerTask() == null) {
+
if(((SipContext)sipManager.getContainer()).getConcurrencyControlMode() !=
ConcurrencyControlMode.SipApplicationSession) {
+ if(logger.isDebugEnabled()) {
+ if(sipApplicationSession == null) {
+ logger.debug("sip application session for key " + sasData.getKey()
+ " was not found neither locally or in the cache, sas expiration timer
recreation will be problematic");
+ } else {
+ logger.debug("sip application session for key " + sasData.getKey()
+ " was found");
+ }
+ }
+ FaultTolerantSasTimerTask faultTolerantSasTimerTask = new
FaultTolerantSasTimerTask(sipApplicationSession, sasData);
+ if(sipApplicationSession != null) {
+
sipApplicationSession.setExpirationTimerTask(faultTolerantSasTimerTask);
+ }
+ return faultTolerantSasTimerTask;
+ }
+ }
+ // returning null to avoid recovery since it was already
recovered above
return null;
}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/TimerServiceTaskFactory.java
Thu Dec 9 10:49:05 2010
+++
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/TimerServiceTaskFactory.java
Fri Dec 10 04:56:47 2010
@@ -49,9 +49,12 @@
*/
public TimerTask newTimerTask(TimerTaskData data) {
MobicentsSipApplicationSession sipApplicationSession =
sipManager.getSipApplicationSession(((TimerServiceTaskData)data).getKey(),
false);
-
if(((SipContext)sipManager.getContainer()).getConcurrencyControlMode() !=
ConcurrencyControlMode.SipApplicationSession) {
- return new TimerServiceTask(sipManager, null,
(TimerServiceTaskData)data);
- }
+ if(sipApplicationSession.getTimer((String)data.getTaskID()) ==
null) {
+
if(((SipContext)sipManager.getContainer()).getConcurrencyControlMode() !=
ConcurrencyControlMode.SipApplicationSession) {
+ return new TimerServiceTask(sipManager, null,
(TimerServiceTaskData)data);
+ }
+ }
+ // returning null to avoid recovery since it was already
recovered above
return null;
}