svn commit: r1136377 - in /incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki: FusekiCmd.java server/SPARQLServer.java

[an...@apache.org]

Author: andy
Date: Thu Jun 16 11:06:17 2011
New Revision: 1136377

URL: http://svn.apache.org/viewvc?rev=1136377&view=rev
Log:
Fix thread pool at 5.  

Modified:
    incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java
    incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java

Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java?rev=1136377&r1=1136376&r2=1136377&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java Thu Jun 16 11:06:17 2011
@@ -86,7 +86,7 @@ public class FusekiCmd extends CmdARQ
         add(argTDB,     "--loc=DIR",    "use an existing TDB database (or create if does not exist)") ;
         add(argMemTDB,  "--memTDB",     "Create an in-memory, non-persistent dataset using TDB (testing only)") ;
         add(argPort,    "--port",       "Port number") ;
-        add(argTimeout, "--timeout",    "Global timeout applied to queries (value in ms)") ;
+        add(argTimeout, "--timeout",    "Global timeout applied to queries (value in ms) -- format is X[,Y] ") ;
         add(argAllowUpdate, "--update", "Allow updates (via SPARQL Update and SPARQL HTTP Update)") ;
         super.modVersion.addClass(TDB.class) ;
         super.modVersion.addClass(Fuseki.class) ;

Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java?rev=1136377&r1=1136376&r2=1136377&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java Thu Jun 16 11:06:17 2011
@@ -12,12 +12,12 @@ import static org.openjena.fuseki.Fuseki
 import javax.servlet.http.HttpServlet ;
 
 import org.eclipse.jetty.http.MimeTypes ;
-import org.eclipse.jetty.server.Connector ;
 import org.eclipse.jetty.server.Server ;
 import org.eclipse.jetty.server.nio.BlockingChannelConnector ;
 import org.eclipse.jetty.servlet.DefaultServlet ;
 import org.eclipse.jetty.servlet.ServletContextHandler ;
 import org.eclipse.jetty.servlet.ServletHolder ;
+import org.eclipse.jetty.util.thread.QueuedThreadPool ;
 import org.openjena.atlas.logging.Log ;
 import org.openjena.fuseki.Fuseki ;
 import org.openjena.fuseki.HttpNames ;
@@ -48,6 +48,8 @@ public class SPARQLServer
     private boolean verbose = false ;
     private boolean enableUpdate = false ;
     
+    private static int ThreadPoolSize = 5 ;
+    
     public SPARQLServer(DatasetGraph dsg, String datasetPath, int port, boolean allowUpdate, boolean verbose)
     {
         this.port = port ;
@@ -103,15 +105,18 @@ public class SPARQLServer
         server = new Server();
         // Using "= new SelectChannelConnector() ;" on Darwin (OS/X) causes problems 
         // with initialization not seen (thread scheduling?) in Joseki.
-        Connector connector = new BlockingChannelConnector() ;
-        // Ignore. 
-        // if set, then if this goes off, it keeps going off.
+        BlockingChannelConnector connector = new BlockingChannelConnector() ;
+        // Max outstanding requests per connector (= server) 
+        connector.setThreadPool(new QueuedThreadPool(ThreadPoolSize));
+        
+        // Ignore. If set, then if this goes off, it keeps going off.
         connector.setMaxIdleTime(0) ; // Jetty outputs a lot of messages if this goes off.
         connector.setPort(port);
         
         // Some people do try very large operations ...
-        connector.setRequestBufferSize(2*1024*1024) ;
-        connector.setResponseBufferSize(2*1024*1024) ;
+        connector.setRequestHeaderSize(64*1024) ;
+        connector.setRequestBufferSize(5*1024*1024) ;
+        connector.setResponseBufferSize(5*1024*1024) ;
         server.addConnector(connector) ;
 
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);