[jboss-cvs] JBoss Messaging SVN: r7225 - in trunk: src/main/org/jboss/messaging/core/client/impl and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2009-06-05 09:39:55 -0400 (Fri, 05 Jun 2009)
New Revision: 7225

Modified:
   trunk/examples/core/perf/perf.properties
   trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/Pinger.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
Log:
pingig fix

Modified: trunk/examples/core/perf/perf.properties
===================================================================
--- trunk/examples/core/perf/perf.properties	2009-06-05 13:06:03 UTC (rev 7224)
+++ trunk/examples/core/perf/perf.properties	2009-06-05 13:39:55 UTC (rev 7225)
@@ -1,5 +1,5 @@
-num-messages=100000
-num-warmup-messages=0
+num-messages=20000
+num-warmup-messages=4000
 message-size=1000
 durable=true
 transacted=false

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java	2009-06-05 13:06:03 UTC (rev 7224)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java	2009-06-05 13:39:55 UTC (rev 7225)
@@ -1180,7 +1180,7 @@
          if (!conn.isDataReceived())
          {
             final MessagingException me = new MessagingException(MessagingException.CONNECTION_TIMEDOUT,
-                                                                 "Did not receive ping on connection. It is likely a client has exited or crashed without " + "closing its connection, or the network between the server and client has failed. The connection will now be closed.");
+                                                                 "Did not receive data from server (or ping).");
 
             threadPool.execute(new Runnable()
             {

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/Pinger.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/Pinger.java	2009-06-05 13:06:03 UTC (rev 7224)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/Pinger.java	2009-06-05 13:39:55 UTC (rev 7225)
@@ -64,8 +64,11 @@
          return;
       }
       
-      if (!conn.isDataSent())
-      {
+      //TODO - for now we *always* sent the ping otherwise, if we have large GC pauses
+      //can end up with pings not arriving at client in time
+      
+//      if (!conn.isDataSent())
+//      {
          // We only send a ping if no data has been sent since last ping
 
          Ping ping = new Ping();
@@ -73,7 +76,7 @@
          Channel channel0 = conn.getChannel(0, -1, false);
          
          channel0.send(ping);
-      }
+    //  }
 
       conn.clearDataSent();
    }

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-06-05 13:06:03 UTC (rev 7224)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-06-05 13:39:55 UTC (rev 7225)
@@ -192,7 +192,10 @@
    private final Object initialiseLock = new Object();
 
    private boolean initialised;
+   
+   private ConnectionManager replicatingConnectionManager;
 
+
    // Constructors
    // ---------------------------------------------------------------------------------
 
@@ -334,7 +337,7 @@
 
          replicatingConnection = null;
          replicatingChannel = null;
-
+         
          replicatingConnectionManager.close();
       }
 
@@ -353,7 +356,6 @@
       threadPool.shutdown();
       try
       {
-         log.info("*** waiting for pool to terminate");
          if (!threadPool.awaitTermination(30000, TimeUnit.MILLISECONDS))
          {
             log.warn("Timed out waiting for pool to terminate");
@@ -613,8 +615,6 @@
       }
    }
 
-   private ConnectionManager replicatingConnectionManager;
-
    public MessagingServerControl getMessagingServerControl()
    {
       return messagingServerControl;
@@ -1099,12 +1099,12 @@
             {
                log.warn("Backup server MUST be started before live server. Initialisation will proceed.");
 
-               return false;
+               return false; 
             }
          }
       }
 
-      return true;
+      return true;      
    }
 
    private void loadJournal() throws Exception