cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java DeltaRequest.java

[pero]

pero2005/08/17 01:13:12

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java DeltaRequest.java
  Log:
  Only replicated GenericPrincipals.
  Please don't use UserDatabaseRelam for clustered applications... (I hope we 
can fix it...)
  
  Revision  ChangesPath
  1.52  +8 -7  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- DeltaManager.java 27 Jul 2005 15:11:38 -  1.51
  +++ DeltaManager.java 17 Aug 2005 08:13:12 -  1.52
  @@ -624,10 +624,12 @@
* @param msg Session message
*/
   protected void send(SessionMessage msg) {
  -if(isSendClusterDomainOnly())
  -cluster.sendClusterDomain(msg);
  -else
  -cluster.send(msg);
  +if(cluster != null) {
  +if(isSendClusterDomainOnly())
  +cluster.sendClusterDomain(msg);
  +else
  +cluster.send(msg);
  +}
   }
   
   /**
  @@ -1128,7 +1130,6 @@
   if (log.isDebugEnabled())
   log.debug(sm.getString(deltaManager.stopped, getName()));
   
  -getCluster().removeManager(getName(),this);
   
   // Validate and update our current component state
   if (!started)
  @@ -1154,7 +1155,7 @@
   
   // Require a new random number generator if we are restarted
   this.random = null;
  -
  +getCluster().removeManager(getName(),this);
   if (initialized) {
   destroy();
   }
  
  
  
  1.14  +8 -3  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
  
  Index: DeltaRequest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DeltaRequest.java 27 Apr 2005 15:45:55 -  1.13
  +++ DeltaRequest.java 17 Aug 2005 08:13:12 -  1.14
  @@ -26,9 +26,11 @@
* @version 1.0
*/
   
  -import java.util.LinkedList;
   import java.io.Externalizable;
   import java.security.Principal;
  +import java.util.LinkedList;
  +
  +import org.apache.catalina.Realm;
   import org.apache.catalina.realm.GenericPrincipal;
   
   
  @@ -80,12 +82,15 @@
   int action = ACTION_SET;
   addAction(TYPE_MAXINTERVAL,action,NAME_MAXINTERVAL,new 
Integer(interval));
   }
  -
  +
   public void setPrincipal(Principal p) {
   int action = (p==null)?ACTION_REMOVE:ACTION_SET;
   SerializablePrincipal sp = null;
   if ( p != null ) {
  -sp = SerializablePrincipal.createPrincipal((GenericPrincipal)p);
  +if(p instanceof GenericPrincipal)
  +sp = 
SerializablePrincipal.createPrincipal((GenericPrincipal)p);
  +else
  +log.error(Only principal class GenericPrincipal currently 
supported use MemoryRealm );
   }
   addAction(TYPE_PRINCIPAL,action,NAME_PRINCIPAL,sp);
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java SimpleTcpReplicationManager.java

[pero]

pero2005/07/16 14:00:12

  Modified:modules/cluster/src/share/org/apache/catalina/cluster
CatalinaCluster.java ClusterManager.java
   modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java SimpleTcpReplicationManager.java
  Log:
  Open Cluster APi that Context can have its own Cluster Manager config.
  
  Revision  ChangesPath
  1.13  +3 -4  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java
  
  Index: CatalinaCluster.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- CatalinaCluster.java  9 Jun 2005 20:37:33 -   1.12
  +++ CatalinaCluster.java  16 Jul 2005 21:00:12 -  1.13
  @@ -19,11 +19,10 @@
   import java.util.Map;
   
   import org.apache.catalina.Cluster;
  -import org.apache.catalina.cluster.io.ListenCallback;
   import org.apache.catalina.LifecycleException;
  +import org.apache.catalina.Manager;
   import org.apache.catalina.Valve;
   import org.apache.commons.logging.Log;
  -import org.apache.catalina.Manager;
   
   /**
* A bCatalinaCluster/b interface allows to plug in and out the 
  @@ -124,7 +123,7 @@
*/
   public Map getManagers();
   public Manager getManager(String name);
  -public void removeManager(String name);
  +public void removeManager(String name,Manager manager);
   public void addManager(String name,Manager manager);
   public Valve[] getValves();
   
  
  
  
  1.10  +27 -2 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterManager.java
  
  Index: ClusterManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ClusterManager.java   9 Jun 2005 20:37:33 -   1.9
  +++ ClusterManager.java   16 Jul 2005 21:00:12 -  1.10
  @@ -59,17 +59,42 @@
  public String[] getInvalidatedSessions();
  
  /**
  -* Return the name of the manager, typically the context name such as 
/replicator
  +* Return the name of the manager, at host /context name and at engine 
hostname+/context
   * @return String
  +* @since 5.5.10
   */
  public String getName();
  
  +   /**
  +* Set the name of the manager, at host /context name and at engine 
hostname+/context
  +* @param name
  +* @since 5.5.10
  +*/
  public void setName(String name);

  public CatalinaCluster getCluster();
  public void setCluster(CatalinaCluster cluster);
  +   
  +   /**
  +* @return Manager send only to same cluster domain
  +* @since 5.5.10
  +*/
  public boolean isSendClusterDomainOnly() ;
  +   /**
  +* @param boolean
  +* @since 5.5.10
  +*/
  public void setSendClusterDomainOnly(boolean sendClusterDomainOnly) ;
  - 
  +   /**
  +* @param mode
  +* @since 5.5.10
  +*/
  +   public void setDefaultMode(boolean  mode) ;
  +   /**
  +* @param overwrite properties from SimpleTcpCluster
  +* @since 5.5.10
  +*/
  +   public boolean isDefaultMode() ;
  +   
  
   }
  \ No newline at end of file
  
  
  
  1.50  +18 -2 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- DeltaManager.java 1 Jul 2005 16:47:10 -   1.49
  +++ DeltaManager.java 16 Jul 2005 21:00:12 -  1.50
  @@ -100,6 +100,8 @@
   
   protected String name = null;
   
  +protected boolean defaultMode = false;
  +
   private CatalinaCluster cluster = null;
   
   /**
  @@ -497,6 +499,20 @@
   this.notifyListenersOnReplication = notifyListenersOnReplication;
   }
   
  +
  +/**
  + * @return Returns the defaultMode.
  + */
  +public boolean isDefaultMode() {
  +return defaultMode;
  +}
  +/**
  + * @param defaultMode The defaultMode to set.
  + */
  +public void setDefaultMode(boolean defaultMode) {
  +this.defaultMode = defaultMode;
  +}
  +
   public CatalinaCluster getCluster() {
   return cluster;
   }
  @@ -1112,7 +1128,7 @@
   if (log.isDebugEnabled())
   

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java LocalStrings.properties

[pero]

pero2005/07/01 09:47:11

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java LocalStrings.properties
  Log:
  Fix docs at register message to container host or engine
  
  Revision  ChangesPath
  1.49  +13 -2 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- DeltaManager.java 26 Jun 2005 21:21:49 -  1.48
  +++ DeltaManager.java 1 Jul 2005 16:47:10 -   1.49
  @@ -919,7 +919,7 @@
if(engine != null  engine instanceof Engine) {
cluster = engine.getCluster();
if(cluster != null  cluster instanceof 
CatalinaCluster) {
  - setCluster((CatalinaCluster) cluster) ;
  + setCluster((CatalinaCluster) 
cluster) ;
}
} else {
cluster = null ;
  @@ -931,6 +931,17 @@
   if (cluster == null) {
   log.error(sm.getString(deltaManager.noCluster, getName()));
   return;
  +} else {
  +if (log.isInfoEnabled()) {
  +String type = unknown ;
  +if( cluster.getContainer() instanceof Host){
  +type = Host ;
  +} else if( cluster.getContainer() instanceof Engine){
  +type = Engine ;
  +}
  +log.info(sm
  +.getString(deltaManager.registerCluster, 
getName(), type, cluster.getClusterName()));
  +}
   }
   if (log.isInfoEnabled())
   log.info(sm
  
  
  
  1.10  +1 -0  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- LocalStrings.properties   26 Jun 2005 21:21:49 -  1.9
  +++ LocalStrings.properties   1 Jul 2005 16:47:10 -   1.10
  @@ -34,6 +34,7 @@
   deltaManager.receiveMessage.allSessionDataAfter=Manager [{0}]: session state 
deserialized
   deltaManager.receiveMessage.allSessionDataBegin=Manager [{0}]: received 
session state data
   deltaManager.receiveMessage.fromWrongDomain=Manager [{0}]: Received wrong 
SessionMessage of type=({1}) from [{2}] with domain [{3}] (localdomain [{4}] 
  +deltaManager.registerCluster=Register manager {0} to cluster element {1} 
with name {2}
   deltaManager.sessionReceived=Manager [{0}]; session state send at {1} 
received in {2} ms.
   deltaManager.sessionTimeout=Invalid session timeout setting {0}
   deltaManager.startClustering=Starting clustering manager at {0}
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java

[pero]

pero2005/04/29 13:11:26

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java
  Log:
  fIX that application can start/stop and start again.
  
  Revision  ChangesPath
  1.46  +20 -2 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- DeltaManager.java 22 Apr 2005 20:33:45 -  1.45
  +++ DeltaManager.java 29 Apr 2005 20:11:26 -  1.46
  @@ -29,8 +29,10 @@
   import java.util.Date;
   import java.util.Iterator;
   
  +import org.apache.catalina.Cluster;
   import org.apache.catalina.Container;
   import org.apache.catalina.Context;
  +import org.apache.catalina.Host;
   import org.apache.catalina.Lifecycle;
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
  @@ -896,6 +898,22 @@
   // Load unloaded sessions, if any
   try {
   //the channel is already running
  +Cluster cluster = getCluster() ;
  +// stop remove cluster binding
  +if(cluster == null) {
  +Container context = getContainer() ;
  +if(context != null  context instanceof Context) {
  + Container host = context.getParent() ;
  + if(host != null  host instanceof Host) {
  + cluster = host.getCluster();
  + if(cluster != null  cluster instanceof 
CatalinaCluster) {
  + setCluster((CatalinaCluster) cluster) ;
  + } else {
  + cluster = null ;
  + }
  + }
  +}
  +}
   if (cluster == null) {
   log.error(sm.getString(deltaManager.noCluster, getName()));
   return;
  @@ -905,7 +923,7 @@
   .getString(deltaManager.startClustering, 
getName()));
   //to survice context reloads, as only a stop/start is called, not
   // createManager
  -getCluster().addManager(getName(), this);
  +((CatalinaCluster)cluster).addManager(getName(), this);
   
   getAllClusterSessions();
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java DeltaSession.java

[fhanik]

fhanik  2005/03/03 06:06:37

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java DeltaSession.java
  Log:
  Make sure the delta request is initated properly, fix thanks to Tkayuki 
Kaneko, JP
  
  Revision  ChangesPath
  1.41  +2 -1  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- DeltaManager.java 15 Feb 2005 09:25:04 -  1.40
  +++ DeltaManager.java 3 Mar 2005 14:06:36 -   1.41
  @@ -409,6 +409,7 @@
   //make sure that the session gets ready to expire if
   // needed
   session.setAccessCount(0);
  +session.resetDeltaRequest();
   sessions.put(session.getId(), session);
   }
   } catch (ClassNotFoundException e) {
  
  
  
  1.30  +4 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- DeltaSession.java 11 Feb 2005 19:43:51 -  1.29
  +++ DeltaSession.java 3 Mar 2005 14:06:36 -   1.30
  @@ -97,7 +97,7 @@
   
   super();
   this.manager = manager;
  -
  +this.resetDeltaRequest();
   }
   
   // - Instance 
Variables
  @@ -350,6 +350,8 @@
   if (manager != null)
   manager.add(this);
   tellNew();
  +if ( deltaRequest == null ) resetDeltaRequest();
  +else deltaRequest.setSessionId(id);
   }
   
   /**
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java

[fhanik]

fhanik  2005/03/03 06:07:33

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
Tag: TOMCAT_5_0 DeltaManager.java
  Log:
  Make sure the delta request is initated properly, fix thanks to Tkayuki 
Kaneko, JP
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.27.2.3  +2 -1  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.27.2.2
  retrieving revision 1.27.2.3
  diff -u -r1.27.2.2 -r1.27.2.3
  --- DeltaManager.java 20 Oct 2004 17:02:16 -  1.27.2.2
  +++ DeltaManager.java 3 Mar 2005 14:07:33 -   1.27.2.3
  @@ -454,6 +454,7 @@
   //correct timestamp, isValid returns true, cause 
accessCount=1
   session.access();
   //make sure that the session gets ready to expire if 
needed
  +session.resetDeltaRequest();
   session.setAccessCount(0);
   sessions.put(session.getId(), session);
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java

[fhanik]

fhanik  2005/02/08 15:15:06

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java
  Log:
  Set the context class loader while doing a state transfer, otherwise static 
struts classes fail loading
  
  Revision  ChangesPath
  1.38  +70 -60
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- DeltaManager.java 7 Feb 2005 21:56:32 -   1.37
  +++ DeltaManager.java 8 Feb 2005 23:15:06 -   1.38
  @@ -357,52 +357,28 @@
   ObjectInputStream ois = null;
   Loader loader = null;
   ClassLoader classLoader = null;
  +ClassLoader originalLoader = 
Thread.currentThread().getContextClassLoader();
   try {
  -fis = new ByteArrayInputStream(data);
  -BufferedInputStream bis = new BufferedInputStream(fis);
  -if (container != null)
  -loader = container.getLoader();
  -if (loader != null)
  -classLoader = loader.getClassLoader();
  -if (classLoader != null) {
  -ois = new CustomObjectInputStream(bis, classLoader);
  -} else {
  -ois = new ObjectInputStream(bis);
  -}
  -} catch (IOException e) {
  -log.error(sm.getString(standardManager.loading.ioe, e), e);
  -if (ois != null) {
  -try {
  -ois.close();
  -} catch (IOException f) {
  -;
  -}
  -ois = null;
  -}
  -throw e;
  -}
  -
  -// Load the previously unloaded active sessions
  -synchronized (sessions) {
  +
   try {
  -Integer count = (Integer) ois.readObject();
  -int n = count.intValue();
  -for (int i = 0; i  n; i++) {
  -DeltaSession session = getNewDeltaSession();
  -session.readObjectData(ois);
  -session.setManager(this);
  -session.setValid(true);
  -session.setPrimarySession(false);
  -//in case the nodes in the cluster are out of 
  -//time synch, this will make sure that we have the
  -//correct timestamp, isValid returns true, cause 
accessCount=1
  -session.access();
  -//make sure that the session gets ready to expire if 
needed
  -session.setAccessCount(0);
  -sessions.put(session.getId(), session);
  +fis = new ByteArrayInputStream(data);
  +BufferedInputStream bis = new BufferedInputStream(fis);
  +if (container != null)
  +loader = container.getLoader();
  +if (loader != null)
  +classLoader = loader.getClassLoader();
  +if (classLoader != null) {
  +log.debug(
  +\n\n\n[CLUSTER] Loading the object data with a 
class loader.\n\n\n);
  +ois = new CustomObjectInputStream(bis, classLoader);
  +
Thread.currentThread().setContextClassLoader(classLoader);
  +} else {
  +log.debug(
  +\n\n\n[CLUSTER] Loading the object data without a 
class loader.\n\n\n);
  +ois = new ObjectInputStream(bis);
   }
  -} catch (ClassNotFoundException e) {
  -  log.error(sm.getString(standardManager.loading.cnfe, e), e);
  +} catch (IOException e) {
  +log.error(sm.getString(standardManager.loading.ioe, e), e);
   if (ois != null) {
   try {
   ois.close();
  @@ -412,27 +388,61 @@
   ois = null;
   }
   throw e;
  -} catch (IOException e) {
  -  log.error(sm.getString(standardManager.loading.ioe, e), e);
  -if (ois != null) {
  +}
  +// Load the previously unloaded active sessions
  +synchronized (sessions) {
  +try {
  +Integer count = (Integer) ois.readObject();
  +int n = count.intValue();
  +for (int i = 0; i  n; i++) {
  +DeltaSession session = getNewDeltaSession();
  +

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java SimpleTcpReplicationManager.java

[pero]

pero2004/11/13 14:10:10

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java SimpleTcpReplicationManager.java
  Log:
  DeltaManager and SimpleTcpReplicationManager generate double jvmRoutes
  
  Revision  ChangesPath
  1.35  +2 -11 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- DeltaManager.java 19 Oct 2004 22:35:22 -  1.34
  +++ DeltaManager.java 13 Nov 2004 22:10:10 -  1.35
  @@ -308,20 +308,11 @@
 DeltaSession session = getNewDeltaSession();
 String sessionId = generateSessionId();
   
  -  String jvmRoute = getJvmRoute();
  -  // @todo Move appending of jvmRoute generateSessionId()???
  -  if (jvmRoute != null) {
  -sessionId += '.' + jvmRoute;
  -  }
 synchronized (sessions) {
   while (sessions.get(sessionId) != null) { // Guarantee uniqueness
 duplicates++;
 sessionId = generateSessionId();
  -  // @todo Move appending of jvmRoute generateSessionId()???
  -  if (jvmRoute != null) {
  -sessionId += '.' + jvmRoute;
  -  }
  -}
  + }
 }
   
 session.setNew(true);
  
  
  
  1.35  +0 -5  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
  
  Index: SimpleTcpReplicationManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- SimpleTcpReplicationManager.java  20 Oct 2004 18:36:35 -  1.34
  +++ SimpleTcpReplicationManager.java  13 Nov 2004 22:10:10 -  1.35
  @@ -188,11 +188,6 @@
   session.setCreationTime(System.currentTimeMillis());
   session.setMaxInactiveInterval(this.maxInactiveInterval);
   String sessionId = generateSessionId();
  -String jvmRoute = getJvmRoute();
  -// @todo Move appending of jvmRoute generateSessionId()???
  -if (jvmRoute != null) {
  -sessionId += '.' + jvmRoute;
  -}
   if ( setId ) session.setId(sessionId);
   if ( notify  (cluster!=null) ) {
   ((ReplicatedSession)session).setIsDirty(true);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java

[fhanik]

fhanik  2004/10/19 14:38:55

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java
  Log:
  expire sessions on shutdown is now used to notify sessions in the cluster.
  the sessions on the local box should always expire, this was discovered when the
  context was reloaded and old sessions were still in place
  
  Revision  ChangesPath
  1.32  +3 -3  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- DeltaManager.java 29 Sep 2004 16:43:44 -  1.31
  +++ DeltaManager.java 19 Oct 2004 21:38:55 -  1.32
  @@ -693,7 +693,7 @@
   started = false;
   
   // Expire all active sessions
  -if ( this.getExpireSessionsOnShutdown() ) {
  +{
   log.info(Expiring sessions upon shutdown);
   Session sessions[] = findSessions();
   for (int i = 0; i  sessions.length; i++) {
  @@ -701,7 +701,7 @@
   if (!session.isValid())
   continue;
   try {
  -session.expire();
  +session.expire(true, this.getExpireSessionsOnShutdown());
   }
   catch (Throwable t) {
   ;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java

[fhanik]

fhanik  2004/10/19 14:59:05

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
Tag: TOMCAT_5_0 DeltaManager.java
  Log:
  Fixed
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.27.2.1  +3 -3  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.27
  retrieving revision 1.27.2.1
  diff -u -r1.27 -r1.27.2.1
  --- DeltaManager.java 4 Jun 2004 20:22:27 -   1.27
  +++ DeltaManager.java 19 Oct 2004 21:59:05 -  1.27.2.1
  @@ -696,7 +696,7 @@
   started = false;
   
   // Expire all active sessions
  -if ( this.getExpireSessionsOnShutdown() ) {
  +{
   log.info(Expiring sessions upon shutdown);
   Session sessions[] = findSessions();
   for (int i = 0; i  sessions.length; i++) {
  @@ -704,7 +704,7 @@
   if (!session.isValid())
   continue;
   try {
  -session.expire();
  +session.expire(true,this.getExpireSessionsOnShutdown());
   }
   catch (Throwable t) {
   ;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java

[fhanik]

fhanik  2004/10/19 15:35:22

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java
  Log:
  removed retarted System.out statement
  
  Revision  ChangesPath
  1.34  +1 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- DeltaManager.java 19 Oct 2004 22:30:50 -  1.33
  +++ DeltaManager.java 19 Oct 2004 22:35:22 -  1.34
  @@ -626,7 +626,6 @@
   return;
   }
   //to survice context reloads, as only a stop/start is called, not 
createManager
  -System.out.println(\n\n\nADDING MANAGER WITH NAME 
+getName()+\n\n\n);
   getCluster().addManager(getName(),this);
   
   if (cluster.getMembers().length  0) {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java

[fhanik]

fhanik  2004/09/05 15:03:42

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java
  Log:
  removed really annoying debug message
  
  Revision  ChangesPath
  1.30  +1 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- DeltaManager.java 22 Jul 2004 15:41:15 -  1.29
  +++ DeltaManager.java 5 Sep 2004 22:03:42 -   1.30
  @@ -917,7 +917,6 @@
   //  Private Methods
   
   public void backgroundProcess() {
  -log.debug(DeltaManager.backgroundProcess invoked at 
+System.currentTimeMillis());
   processExpires();
   }
   /**
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java SessionMessageImpl.java SimpleTcpReplicationManager.java

[fhanik]

fhanik  2004/05/28 19:43:58

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java SessionMessageImpl.java
SimpleTcpReplicationManager.java
  Log:
  Make sure we enforce the use of unique message Ids, even though they dont have to be
  we should use the right field
  
  Revision  ChangesPath
  1.26  +9 -5  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- DeltaManager.java 26 May 2004 16:37:41 -  1.25
  +++ DeltaManager.java 29 May 2004 02:43:58 -  1.26
  @@ -343,7 +343,8 @@
 getName(),
 SessionMessage.EVT_SESSION_CREATED,
 null,
  -  sessionId);
  +  sessionId,
  +  sessionId+System.currentTimeMillis());
 cluster.send(msg);
 session.resetDeltaRequest();
 }
  @@ -634,7 +635,8 @@
   new SessionMessageImpl(this.getName(),
  SessionMessage.EVT_GET_ALL_SESSIONS,
  null,
  -   GET-ALL);
  +   GET-ALL,
  +   GET-ALL-+getName());
   //just to make sure the other server has the context started
   //long timetowait = 2-mbr.getMemberAliveTime();
   //if ( timetowait  0 ) {
  @@ -796,6 +798,7 @@
  msg = new SessionMessageImpl(getName(),
SessionMessage.EVT_SESSION_ACCESSED,
null,
  + sessionId,
sessionId+System.currentTimeMillis());
  }
  
  @@ -816,7 +819,8 @@
  SessionMessage msg = new SessionMessageImpl(getName(), 
  
SessionMessage.EVT_SESSION_EXPIRED,
  null,
  -   id);
  +   id,
  +   id+-EXPIRED-MSG);
  cluster.send(msg);
  }
  
  @@ -850,7 +854,7 @@
  log.debug(Manager (+name+) unloading sessions complete);
  SessionMessage newmsg = new SessionMessageImpl(name,
  SessionMessage.EVT_ALL_SESSION_DATA,
  -   data, );
  +   data, SESSION-STATE,SESSION-STATE-+getName());
  cluster.send(newmsg, sender);
  break;
  }
  
  
  
  1.2   +1 -1  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java
  
  Index: SessionMessageImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SessionMessageImpl.java   5 May 2004 16:36:13 -   1.1
  +++ SessionMessageImpl.java   29 May 2004 02:43:58 -  1.2
  @@ -58,7 +58,7 @@
* @param attrValue - the value of the attribute added
   
*/
  -public SessionMessageImpl( String contextName,
  +private SessionMessageImpl( String contextName,
  int eventtype,
  byte[] session,
  String sessionID)
  
  
  
  1.26  +6 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
  
  Index: SimpleTcpReplicationManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- SimpleTcpReplicationManager.java  28 May 2004 18:49:37 -  1.25
  +++ SimpleTcpReplicationManager.java  29 May 2004 02:43:58 -  1.26
  @@ -275,6 +275,7 @@
   SessionMessage msg = new SessionMessageImpl(name,
   SessionMessage.EVT_SESSION_EXPIRED,
   null,
  +

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java

[yoavs]

yoavs   2004/05/26 09:37:42

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java
  Log:
  Minor JavaDoc fixes (Bugzilla 28335)
  
  Revision  ChangesPath
  1.25  +3 -3  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- DeltaManager.java 5 May 2004 16:36:12 -   1.24
  +++ DeltaManager.java 26 May 2004 16:37:41 -  1.25
  @@ -191,7 +191,7 @@
   
   /** Number of session creations that failed due to maxActiveSessions
*
  - * @return
  + * @return The count
*/
   public int getRejectedSessions() {
   return rejectedSessions;
  @@ -203,7 +203,7 @@
   
   /** Number of sessions that expired.
*
  - * @return
  + * @return The count
*/
   public int getExpiredSessions() {
   return expiredSessions;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java DeltaSession.java

[fhanik]

fhanik  2004/04/27 10:50:43

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java DeltaSession.java
  Log:
  Added in the ability to run the DeltaManager/DeltaSession without a container, so
  that a different clustering plug in can be used to backup sessions in a 
primary/secondary store
  
  Revision  ChangesPath
  1.23  +12 -2 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- DeltaManager.java 8 Apr 2004 15:30:11 -   1.22
  +++ DeltaManager.java 27 Apr 2004 17:50:43 -  1.23
  @@ -369,8 +369,18 @@
   ReplicationStream ois = null;
   Loader loader = null;
   ClassLoader classLoader = null;
  +//fix to be able to run the DeltaManager
  +//stand alone without a container.
  +//use the Threads context class loader
  +if ( container != null ) 
  +loader = container.getLoader();
  +if ( loader != null ) 
  +classLoader = loader.getClassLoader();
  +else
  +classLoader = Thread.currentThread().getContextClassLoader();
  +//end fix
   fis = new ByteArrayInputStream(data);
  -ois = new ReplicationStream(fis,container.getLoader().getClassLoader());
  +ois = new ReplicationStream(fis,classLoader);
   session.getDeltaRequest().readExternal(ois);
   ois.close();
   return session.getDeltaRequest();
  
  
  
  1.22  +131 -112  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- DeltaSession.java 7 Apr 2004 19:02:31 -   1.21
  +++ DeltaSession.java 27 Apr 2004 17:50:43 -  1.22
  @@ -396,36 +396,42 @@
   
   // Notify interested application event listeners
   Context context = (Context) manager.getContainer();
  -Object listeners[] = context.getApplicationLifecycleListeners();
  -if (listeners != null) {
  -HttpSessionEvent event =
  -new HttpSessionEvent(getSession());
  -for (int i = 0; i  listeners.length; i++) {
  -if (!(listeners[i] instanceof HttpSessionListener))
  -continue;
  -HttpSessionListener listener =
  -(HttpSessionListener) listeners[i];
  -try {
  -fireContainerEvent(context,
  -   beforeSessionCreated,
  -   listener);
  -listener.sessionCreated(event);
  -fireContainerEvent(context,
  -   afterSessionCreated,
  -   listener);
  -} catch (Throwable t) {
  +//fix for standalone manager without container
  +if ( context != null ) { 
  +Object listeners[] = context.getApplicationLifecycleListeners();
  +if (listeners != null) {
  +HttpSessionEvent event =
  +new HttpSessionEvent(getSession());
  +for (int i = 0; i  listeners.length; i++) {
  +if (! (listeners[i] instanceof HttpSessionListener))
  +continue;
  +HttpSessionListener listener =
  +(HttpSessionListener) listeners[i];
   try {
   fireContainerEvent(context,
  +   beforeSessionCreated,
  +   listener);
  +listener.sessionCreated(event);
  +fireContainerEvent(context,
  afterSessionCreated,
  listener);
  -} catch (Exception e) {
  -;
  +} catch (Throwable t) {
  +try {
  +fireContainerEvent(context,
  +   afterSessionCreated,
  +   listener);
  +} catch (Exception e) {
  +;
  +

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java

[fhanik]

fhanik  2004/04/02 06:42:20

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java
  Log:
  Fixed bug 28156. Session access count should be 0 not 1 when the requests are done
  
  Revision  ChangesPath
  1.19  +2 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- DeltaManager.java 1 Mar 2004 21:35:34 -   1.18
  +++ DeltaManager.java 2 Apr 2004 14:42:20 -   1.19
  @@ -869,6 +869,7 @@
  if (session != null) {
  session.access();
  session.setPrimarySession(false);
  +   session.endAccess();
  }
  break;
  }
  @@ -879,7 +880,6 @@
  DeltaRequest dreq = loadDeltaRequest(session, delta);
  dreq.execute(session);
  session.setPrimarySession(false);
  -   session.access();
  }
  
  break;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java

[fhanik]

fhanik  2004/03/01 13:35:34

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java
  Log:
  the new and valid flags have to be set before the creation listeners are invoked
  
  Revision  ChangesPath
  1.18  +4 -4  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- DeltaManager.java 27 Feb 2004 14:58:56 -  1.17
  +++ DeltaManager.java 1 Mar 2004 21:35:34 -   1.18
  @@ -327,13 +327,13 @@
   }
 }
   
  -  session.setId(sessionId);
  -  session.resetDeltaRequest();
  -  // Initialize the properties of the new session and return it
 session.setNew(true);
 session.setValid(true);
 session.setCreationTime(System.currentTimeMillis());
 session.setMaxInactiveInterval(this.maxInactiveInterval);
  +  session.setId(sessionId);
  +  session.resetDeltaRequest();
  +  // Initialize the properties of the new session and return it
   
 sessionCounter++;
 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java DeltaSession.java

[fhanik]

fhanik  2004/02/06 08:15:32

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java DeltaSession.java
  Log:
  Fix for bug 26715, a replicated session will never expire if the primary server 
crashes.
  This will fix that.
  
  Revision  ChangesPath
  1.14  +9 -4  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DeltaManager.java 5 Feb 2004 23:01:29 -   1.13
  +++ DeltaManager.java 6 Feb 2004 16:15:32 -   1.14
  @@ -484,7 +484,12 @@
   session.setManager(this);
   session.setValid(true);
   session.setPrimarySession(false);
  +//in case the nodes in the cluster are out of 
  +//time synch, this will make sure that we have the
  +//correct timestamp, isValid returns true, cause accessCount=1
   session.access();
  +//make sure that the session gets ready to expire if needed
  +session.setAccessCount(0);
   sessions.put(session.getId(), session);
   }
   } catch (ClassNotFoundException e) {
  
  
  
  1.15  +12 -4 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DeltaSession.java 6 Feb 2004 02:09:38 -   1.14
  +++ DeltaSession.java 6 Feb 2004 16:15:32 -   1.15
  @@ -1685,6 +1685,14 @@
   protected void setLastTimeReplicated(long lastTimeReplicated) {
   this.lastTimeReplicated = lastTimeReplicated;
   }
  +  
  +protected void setAccessCount(int accessCount) {
  +  this.accessCount = accessCount;
  +}
  +  
  +protected int getAccessCount() {
  +  return accessCount;
  +}
   
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java DeltaRequest.java DeltaSession.java

[fhanik]

fhanik  2004/02/06 09:30:13

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java DeltaRequest.java
DeltaSession.java
  Log:
  Implemented access logic on the delta request, fixed double expiration on the session
  
  Revision  ChangesPath
  1.15  +8 -7  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DeltaManager.java 6 Feb 2004 16:15:32 -   1.14
  +++ DeltaManager.java 6 Feb 2004 17:30:13 -   1.15
  @@ -949,7 +949,6 @@
* Invalidate all sessions that have expired.
*/
   public void processExpires() {
  -
   long timeNow = System.currentTimeMillis();
   Session sessions[] = findSessions();
   
  @@ -958,7 +957,6 @@
   if (!session.isValid()) {
   try {
   expiredSessions++;
  -session.expire();
   } catch (Throwable t) {
   log.error(sm.getString
 (standardManager.expireException), t);
  @@ -967,17 +965,20 @@
   }
   long timeEnd = System.currentTimeMillis();
   processingTime += ( timeEnd - timeNow );
  -
   }
  +
   public boolean getStateTransferred() {
   return stateTransferred;
   }
  +
   public void setStateTransferred(boolean stateTransferred) {
   this.stateTransferred = stateTransferred;
   }
  +
   public CatalinaCluster getCluster() {
   return cluster;
   }
  +
   public void setCluster(CatalinaCluster cluster) {
   this.cluster = cluster;
   }
  
  
  
  1.6   +5 -3  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
  
  Index: DeltaRequest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DeltaRequest.java 5 Feb 2004 21:08:02 -   1.5
  +++ DeltaRequest.java 6 Feb 2004 17:30:13 -   1.6
  @@ -161,6 +161,7 @@
   public void execute(DeltaSession session) {
   if ( !this.sessionId.equals( session.getId() ) )
   throw new java.lang.IllegalArgumentException(Session id mismatch, not 
executing the delta request);
  +session.access();
   for ( int i=0; iactions.size(); i++ ) {
   AttributeInfo info = (AttributeInfo)actions.get(i);
   switch ( info.getType() ) {
  @@ -191,6 +192,7 @@
   default : throw new java.lang.IllegalArgumentException(Invalid 
attribute info type=+info);
   }//switch
   }//for
  +session.endAccess();
   }
   
   public void reset() {
  
  
  
  1.16  +5 -6  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DeltaSession.java 6 Feb 2004 16:15:32 -   1.15
  +++ DeltaSession.java 6 Feb 2004 17:30:13 -   1.16
  @@ -661,7 +661,7 @@
   //the primary session has probably crashed, and no other
   //requests are coming in. that is why we do this. otherwise
   //we would have a memory leak
  -expire(true);
  +expire(true,false);
   }
   }
   
  @@ -745,7 +745,6 @@
   // Mark this session as being expired if needed
   if (expiring)
   return;
  -
   String expiredId = getId();
   
   synchronized (this) {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java DeltaSession.java ReplicatedSession.java

[fhanik]

fhanik  2004/02/04 12:22:26

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java DeltaSession.java
ReplicatedSession.java
  Log:
  Added in distributed expire logic for the delta session
  
  Revision  ChangesPath
  1.9   +18 -4 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DeltaManager.java 15 Jan 2004 05:29:05 -  1.8
  +++ DeltaManager.java 4 Feb 2004 20:22:26 -   1.9
  @@ -815,6 +815,20 @@
sessionId);
  }
  session.setPrimarySession(true);
  +   //check to see if we need to send out an access message
  +   if ( (msg == null) ) {
  +   long replDelta = System.currentTimeMillis() - 
session.getLastTimeReplicated();
  +   if ( replDelta  (getMaxInactiveInterval()*1000) ) {
  +   msg = new SessionMessage(getName(),
  + SessionMessage.EVT_SESSION_ACCESSED,
  + null,
  + sessionId);
  +   }
  +   
  +   }
  +   
  +   //update last replicated time
  +   if ( msg != null ) 
session.setLastTimeReplicated(System.currentTimeMillis());
  return msg;
  }
  catch (IOException x) {
  
  
  
  1.11  +20 -5 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DeltaSession.java 21 Jan 2004 19:00:19 -  1.10
  +++ DeltaSession.java 4 Feb 2004 20:22:26 -   1.11
  @@ -1,3 +1,4 @@
  +
   /*
* $Header$
* $Revision$
  @@ -331,6 +332,13 @@
*/
   private transient DeltaRequest deltaRequest = null;
   
  +
  +/**
  + * Last time the session was replicatd, used for distributed 
  + * expiring of session
  + */
  +private transient long lastTimeReplicated = System.currentTimeMillis();
  +
   // - Session Properties
   
   /**
  @@ -1469,7 +1477,6 @@
   }
   }
   isValid = isValidSave;
  -
   }
   
   
  @@ -1647,6 +1654,14 @@
   return (attributes.get(name));
   }
   
  +}
  +
  +protected long getLastTimeReplicated() {
  +return lastTimeReplicated;
  +}
  +
  +protected void setLastTimeReplicated(long lastTimeReplicated) {
  +this.lastTimeReplicated = lastTimeReplicated;
   }
   
   }
  
  
  
  1.10  +4 -3  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java
  
  Index: ReplicatedSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ReplicatedSession.java12 Jan 2004 05:23:10 -  1.9
  +++ ReplicatedSession.java4 Feb 2004 20:22:26 -   1.10
  @@ -1,3 +1,4 @@
  +
   /*
* $Header$
* $Revision$
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java DeltaSession.java

[fhanik]

fhanik  2004/01/14 21:29:06

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java DeltaSession.java
  Log:
  small fixes
  
  Revision  ChangesPath
  1.8   +22 -7 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DeltaManager.java 15 Jan 2004 04:19:50 -  1.7
  +++ DeltaManager.java 15 Jan 2004 05:29:05 -  1.8
  @@ -479,6 +479,9 @@
   DeltaSession session = getNewDeltaSession();
   session.readObjectData(ois);
   session.setManager(this);
  +session.setValid(true);
  +session.setPrimarySession(false);
  +session.access();
   sessions.put(session.getId(), session);
   }
   } catch (ClassNotFoundException e) {
  @@ -660,6 +663,14 @@
  SessionMessage.EVT_GET_ALL_SESSIONS,
  null,
  GET-ALL);
  +//just to make sure the other server has the context started
  +//long timetowait = 2-mbr.getMemberAliveTime();
  +//if ( timetowait  0 ) {
  +//log.info(The other server has not been around more than 20 
seconds, will sleep for +timetowait+ ms. in order to let it startup);
  +//try { Thread.currentThread().sleep(timetowait); } catch ( 
Exception x ) {}
  +//}//end if
  +
  +//request session state
   cluster.send(msg, mbr);
   log.warn(Manager[+getName()+], requesting session state from 
+mbr+
. This operation will timeout if no session state has 
been received within +
  @@ -712,6 +723,7 @@
   
   // Expire all active sessions
   if ( this.getExpireSessionsOnShutdown() ) {
  +log.info(Expiring sessions upon shutdown);
   Session sessions[] = findSessions();
   for (int i = 0; i  sessions.length; i++) {
   DeltaSession session = (DeltaSession) sessions[i];
  @@ -884,9 +896,12 @@
  case SessionMessage.EVT_SESSION_DELTA : {
  byte[] delta = msg.getSession();
  DeltaSession session = 
(DeltaSession)findSession(msg.getSessionID());
  -   DeltaRequest dreq = loadDeltaRequest(session,delta);
  -   dreq.execute(session);
  -   session.setPrimarySession(false);
  +   if (session != null) {
  +   DeltaRequest dreq = loadDeltaRequest(session, delta);
  +   dreq.execute(session);
  +   session.setPrimarySession(false);
  +   session.access();
  +   }
  
  break;
  }
  
  
  
  1.9   +7 -5  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DeltaSession.java 13 Jan 2004 05:26:59 -  1.8
  +++ DeltaSession.java 15 Jan 2004 05:29:06 -  1.9
  @@ -641,7 +641,9 @@
   expire(true);
   } else if ( timeIdle = (2*maxInactiveInterval) ) {
   //if the session has been idle twice as long as allowed,
  -//the primary session has probably crashed
  +//the primary session has probably crashed, and no other
  +//requests are coming in. that is why we do this. otherwise
  +//we would have a memory leak
   expire(true);
   }
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]