asmuts 2004/07/15 18:27:43
Modified: src/java/org/apache/jcs/auxiliary/lateral/socket/tcp
LateralTCPSender.java LateralTCPListener.java
src/java/org/apache/jcs/auxiliary/lateral
LateralCacheNoWaitFacade.java
LateralCacheNoWait.java LateralCacheMonitor.java
LateralCacheManager.java LateralCacheFactory.java
LateralCacheAttributes.java LateralCache.java
Log:
fixed recovery bug, will now work for more than one server
added stats
Revision Changes Path
1.12 +10 -2
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
Index: LateralTCPSender.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LateralTCPSender.java 12 Jun 2004 02:33:41 -0000 1.11
+++ LateralTCPSender.java 16 Jul 2004 01:27:42 -0000 1.12
@@ -61,6 +61,7 @@
private ObjectOutputStream oos;
private Socket socket;
int counter = 0;
+ private int sendCnt = 0;
// reset the ObjectOutputStream every 70 calls
//private static final int RESET_FREQUENCY = 70;
@@ -173,6 +174,13 @@
public void send( LateralElementDescriptor led )
throws IOException
{
+ sendCnt++;
+ if ( log.isInfoEnabled() ) {
+ if ( sendCnt % 100 == 0 ) {
+ log.info( "Send Count = " + sendCnt );
+ }
+ }
+
log.debug( "sending LateralElementDescriptor" );
if ( led == null )
@@ -197,7 +205,7 @@
counter = 0;
// Failing to reset the object output stream every now and
// then creates a serious memory leak.
- log.info( "Doing oos.reset()" );
+ log.debug( "Doing oos.reset()" );
oos.reset();
}
}
1.9 +19 -1
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
Index: LateralTCPListener.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LateralTCPListener.java 12 Jun 2004 02:34:12 -0000 1.8
+++ LateralTCPListener.java 16 Jul 2004 01:27:42 -0000 1.9
@@ -68,6 +68,9 @@
private PooledExecutor pooledExecutor = new PooledExecutor();
+ private int putCnt = 0;
+ private int removeCnt = 0;
+
// -------------------------------------------------------- factory methods
/**
@@ -164,11 +167,19 @@
public void handlePut( ICacheElement element )
throws IOException
{
+ putCnt++;
+ if ( log.isInfoEnabled() ) {
+ if ( putCnt % 100 == 0 ) {
+ log.info( "Put Count = " + putCnt );
+ }
+ }
+
if ( log.isDebugEnabled() )
{
log.debug( "handlePut> cacheName=" + element.getCacheName() + ", key="
+ element.getKey() );
}
+
// This was the following, however passing true in for updateRemotes
// causes an a loop, since the element will the be sent to the sender.
// Passing false in fixes things, but I'm not sure I understand all
@@ -183,6 +194,13 @@
public void handleRemove( String cacheName, Serializable key )
throws IOException
{
+ removeCnt++;
+ if ( log.isInfoEnabled() ) {
+ if ( removeCnt % 100 == 0 ) {
+ log.info( "Remove Count = " + removeCnt );
+ }
+ }
+
if ( log.isDebugEnabled() )
{
log.debug( "handleRemove> cacheName=" + cacheName + ", key=" + key );
1.9 +10 -0
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
Index: LateralCacheNoWaitFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LateralCacheNoWaitFacade.java 27 Apr 2004 21:08:24 -0000 1.8
+++ LateralCacheNoWaitFacade.java 16 Jul 2004 01:27:42 -0000 1.9
@@ -228,4 +228,14 @@
{
return "LateralCacheNoWaitFacade: " + cacheName;
}
+
+ /**
+ * getStats
+ *
+ * @return String
+ */
+ public String getStats()
+ {
+ return "";
+ }
}
1.8 +10 -0
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWait.java
Index: LateralCacheNoWait.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWait.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LateralCacheNoWait.java 27 Apr 2004 21:08:24 -0000 1.7
+++ LateralCacheNoWait.java 16 Jul 2004 01:27:42 -0000 1.8
@@ -236,4 +236,14 @@
{
return "LateralCacheNoWait: " + cache.toString();
}
+
+ /**
+ * getStats
+ *
+ * @return String
+ */
+ public String getStats()
+ {
+ return "";
+ }
}
1.7 +18 -10
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheMonitor.java
Index: LateralCacheMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheMonitor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LateralCacheMonitor.java 12 Jun 2004 02:34:12 -0000 1.6
+++ LateralCacheMonitor.java 16 Jul 2004 01:27:42 -0000 1.7
@@ -37,7 +37,7 @@
public class LateralCacheMonitor implements Runnable
{
private final static Log log =
- LogFactory.getLog( LateralCacheManager.class );
+ LogFactory.getLog( LateralCacheMonitor.class );
private static LateralCacheMonitor instance;
private static long idlePeriod = 20 * 1000;
@@ -153,21 +153,28 @@
// Monitor each LateralCacheManager instance one after the other.
// Each LateralCacheManager corresponds to one lateral connection.
- for ( Iterator itr = LateralCacheManager.instances.values().iterator();
itr.hasNext(); )
- {
+ log.info( "LateralCacheManager.instances.size() = " +
LateralCacheManager.instances.size() );
+ //for
+ int cnt = 0;
+ Iterator itr = LateralCacheManager.instances.values().iterator();
+ while ( itr.hasNext() ) {
+ cnt++;
LateralCacheManager mgr = ( LateralCacheManager ) itr.next();
try
{
// If any cache is in error, it strongly suggests all caches
managed by the
// same LateralCacheManager instance are in error. So we fix
them once and for all.
- for ( Iterator itr2 = mgr.caches.values().iterator();
itr2.hasNext(); )
- {
- if ( itr2.hasNext() )
+ //for
+ log.info( "\n " + cnt + "- mgr.lca.getTcpServer() = " +
mgr.lca.getTcpServer() + " mgr = " + mgr);
+ log.info( "\n " + cnt + "- mgr.caches.size() = " +
mgr.caches.size() );
+ Iterator itr2 = mgr.caches.values().iterator();
+ //{
+ while( itr2.hasNext() )
{
LateralCacheNoWait c = ( LateralCacheNoWait )
itr2.next();
if ( c.getStatus() == CacheConstants.STATUS_ERROR )
{
- log.debug( "found LateralCacheNoWait in error" );
+ log.info( "found LateralCacheNoWait in error, " +
c.toString() );
LateralCacheRestore repairer = new
LateralCacheRestore( mgr );
// If we can't fix them, just skip and re-try in
the next round.
@@ -179,11 +186,12 @@
{
bad();
}
- break;
+ //break;
+ } else {
+ log.info("lcnw not in error");
}
- log.debug( "lcnw not in error" );
}
- }
+ //}
}
catch ( Exception ex )
{
1.10 +6 -3
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheManager.java
Index: LateralCacheManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LateralCacheManager.java 12 Jun 2004 02:34:12 -0000 1.9
+++ LateralCacheManager.java 16 Jul 2004 01:27:42 -0000 1.10
@@ -87,7 +87,7 @@
LateralCacheManager ins = ( LateralCacheManager ) instances.get(
lca.toString() );
if ( ins == null )
{
- log.debug( "Instance is null, creating" );
+ log.info( "Instance for [" + lca.toString() + "] is null, creating" );
synchronized ( instances )
{
@@ -121,9 +121,9 @@
*
* @param lca
*/
- private LateralCacheManager( ILateralCacheAttributes lca )
+ private LateralCacheManager( ILateralCacheAttributes lcaA )
{
- this.lca = lca;
+ this.lca = lcaA;
if ( log.isDebugEnabled() )
{
@@ -137,6 +137,7 @@
if ( lca.getTransmissionType() == ILateralCacheAttributes.TCP )
{
log.debug( "Creating TCP service" );
+ log.info( "Creating TCP service, lca = " + lca );
this.lateralService = new LateralTCPService( lca );
}
@@ -220,6 +221,8 @@
{
c = new LateralCacheNoWait( new LateralCache( lca, lateralService )
);
caches.put( cacheName, c );
+
+ log.info( "craeted LateralCacheNoWait for " + lca);
}
}
1.9 +4 -3
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheFactory.java
Index: LateralCacheFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LateralCacheFactory.java 12 Jun 2004 02:34:12 -0000 1.8
+++ LateralCacheFactory.java 16 Jul 2004 01:27:42 -0000 1.9
@@ -92,9 +92,10 @@
{
log.debug( "tcp server = " + server );
}
- lac.setTcpServer( server );
- LateralCacheManager lcm = LateralCacheManager.getInstance( lac );
- ICache ic = lcm.getCache( lac.getCacheName() );
+ LateralCacheAttributes lacC = (LateralCacheAttributes)lac.copy();
+ lacC.setTcpServer( server );
+ LateralCacheManager lcm = LateralCacheManager.getInstance( lacC );
+ ICache ic = lcm.getCache( lacC.getCacheName() );
if ( ic != null )
{
noWaits.add( ic );
1.8 +6 -6
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAttributes.java
Index: LateralCacheAttributes.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAttributes.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LateralCacheAttributes.java 12 Jun 2004 02:34:12 -0000 1.7
+++ LateralCacheAttributes.java 16 Jul 2004 01:27:42 -0000 1.8
@@ -439,12 +439,12 @@
public String toString()
{
StringBuffer buf = new StringBuffer();
- buf.append( "cacheName=" + cacheName + "\n" );
- buf.append( "putOnlyMode=" + putOnlyMode + "\n" );
- buf.append( "transmissionTypeName=" + transmissionTypeName + "\n" );
- buf.append( "transmissionType=" + transmissionType + "\n" );
- buf.append( "tcpServer=" + tcpServer + "\n" );
- buf.append( httpServer + udpMulticastAddr + String.valueOf(
udpMulticastPort ) + tcpServer );
+ //buf.append( "cacheName=" + cacheName + "\n" );
+ //buf.append( "putOnlyMode=" + putOnlyMode + "\n" );
+ //buf.append( "transmissionTypeName=" + transmissionTypeName + "\n" );
+ //buf.append( "transmissionType=" + transmissionType + "\n" );
+ //buf.append( "tcpServer=" + tcpServer + "\n" );
+ buf.append( transmissionTypeName + httpServer + udpMulticastAddr +
String.valueOf( udpMulticastPort ) + tcpServer );
return buf.toString();
}
1.10 +10 -0
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java
Index: LateralCache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LateralCache.java 12 Jun 2004 02:34:12 -0000 1.9
+++ LateralCache.java 16 Jul 2004 01:27:42 -0000 1.10
@@ -287,4 +287,14 @@
this.lateral = lateral;
return;
}
+
+ /**
+ * getStats
+ *
+ * @return String
+ */
+ public String getStats()
+ {
+ return "";
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
