[teiid-commits] teiid SVN: r2975 - in trunk: runtime/src/main/java/org/teiid/transport and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-03-08 13:13:40 -0500 (Tue, 08 Mar 2011)
New Revision: 2975

Modified:
   trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
   trunk/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java
   trunk/runtime/src/main/java/org/teiid/transport/SocketListener.java
Log:
TEIID-1502 update to fix maxworker setting

Modified: trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml	2011-03-08 01:38:13 UTC (rev 2974)
+++ trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml	2011-03-08 18:13:40 UTC (rev 2975)
@@ -27,7 +27,8 @@
         <!-- 
             The number of batch columns to allow in memory (default 16384).  
             This value should be set lower or higher depending on the available memory to Teiid in the VM.  
-            16384 is considered a good default for a dedicated 32-bit VM running Teiid with a 1 gig heap.        
+            16384 is considered a good default for a dedicated 32-bit VM running Teiid with a 1 gig heap.
+            See the admin guide for more.          
          -->
         <property name="maxReserveBatchColumns">16384</property>
         <!-- 
@@ -121,8 +122,10 @@
         <property name="enabled">true</property>
         <property name="bindAddress">${jboss.bind.address}</property>
         <property name="portNumber">31000</property>
-        <!-- Max number of threads dedicated to initial request processing (default 15) -->
-        <property name="maxSocketThreads">15</property>
+        <!-- Max number of threads dedicated to initial request processing.
+             Zero indicates the system default of max available processors. (default 0) 
+             Setting this value above the max available processors is not recommended. -->
+        <property name="maxSocketThreads">0</property>
         <!-- SO_RCVBUF size, 0 indicates that system default should be used (default 0) -->
         <property name="inputBufferSize">0</property>
         <!-- SO_SNDBUF size, 0 indicates that system default should be used (default 0) -->
@@ -156,7 +159,8 @@
         <property name="enabled">true</property>
         <property name="bindAddress">${jboss.bind.address}</property>
         <property name="portNumber">31443</property>
-        <!-- Max number of threads dedicated to Admin and initial request processing (default 4) -->
+        <!-- Max number of threads dedicated to Admin request processing.
+             Zero indicates the system default of max available processors. (default 4) -->
         <property name="maxSocketThreads">4</property>
         <!-- SO_RCVBUF size, 0 indicates that system default should be used (default 0) -->
         <property name="inputBufferSize">0</property>
@@ -191,7 +195,10 @@
         <property name="enabled">true</property>
         <property name="bindAddress">${jboss.bind.address}</property>
         <property name="portNumber">35432</property>
-        <!-- Max number of threads dedicated to initial request processing (default 15) -->
+        <!-- Max number of threads dedicated to ODBC request processing.
+             Zero indicates the system default of max available processors. (default 15)
+             ODBC queries are currently blocking on IO operations, so this value
+             should be set the expected number of concurrent ODBC queries -->
         <property name="maxSocketThreads">15</property>
         <!-- SO_RCVBUF size, 0 indicates that system default should be used (default 0) -->
         <property name="inputBufferSize">0</property>

Modified: trunk/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java	2011-03-08 01:38:13 UTC (rev 2974)
+++ trunk/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java	2011-03-08 18:13:40 UTC (rev 2975)
@@ -173,7 +173,7 @@
 		maxChannels = Math.max(maxChannels, this.listeners.size());
 		SslHandler sslHandler = ctx.getPipeline().get(SslHandler.class);
 		if (sslHandler != null) {
-	        sslHandler.handshake(e.getChannel()).addListener(new ChannelFutureListener() {
+	        sslHandler.handshake().addListener(new ChannelFutureListener() {
 	        	public void operationComplete(ChannelFuture arg0)
 	        			throws Exception {
 	        		onConnection(e.getChannel());

Modified: trunk/runtime/src/main/java/org/teiid/transport/SocketListener.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/SocketListener.java	2011-03-08 01:38:13 UTC (rev 2974)
+++ trunk/runtime/src/main/java/org/teiid/transport/SocketListener.java	2011-03-08 18:13:40 UTC (rev 2975)
@@ -77,8 +77,12 @@
         if (LogManager.isMessageToBeRecorded(LogConstants.CTX_TRANSPORT, MessageLevel.DETAIL)) { 
             LogManager.logDetail(LogConstants.CTX_TRANSPORT, "server = " + bindAddress + "binding to port:" + port); //$NON-NLS-1$ //$NON-NLS-2$
 		}
+        
+        if (maxWorkers == 0) {
+        	maxWorkers = Runtime.getRuntime().availableProcessors();
+        }
 		
-        ChannelFactory factory = new NioServerSocketChannelFactory(this.nettyPool, this.nettyPool, Math.min(Runtime.getRuntime().availableProcessors(), maxWorkers));
+        ChannelFactory factory = new NioServerSocketChannelFactory(this.nettyPool, this.nettyPool, maxWorkers);
         
         ServerBootstrap bootstrap = new ServerBootstrap(factory);
         this.channelHandler = createChannelPipelineFactory(config, storageManager);