[mb-commits] r13642 - in search_server/trunk/servlet/src/main: java/org/musicbrainz/search/servlet webapp/WEB-INF

Author: ijabz
Date: 2013-02-28 11:05:41 +0000 (Thu, 28 Feb 2013)
New Revision: 13642

Modified:
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java
   search_server/trunk/servlet/src/main/webapp/WEB-INF/web.xml
Log:
Make it possible to configure indexes uses nfio rather than mmap for testing purposes.

Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java	2013-02-28 10:43:48 UTC (rev 13641)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java	2013-02-28 11:05:41 UTC (rev 13642)
@@ -102,7 +102,15 @@
     @Override
     public void init()
     {
-        init(true);
+        String init = getServletConfig().getInitParameter("init");
+        if(init!=null && init.equals("nfio"))
+        {
+            init(false);
+        }
+        else
+        {
+            init(true);
+        }
     }
 
     /**

Modified: search_server/trunk/servlet/src/main/webapp/WEB-INF/web.xml
===================================================================
--- search_server/trunk/servlet/src/main/webapp/WEB-INF/web.xml	2013-02-28 10:43:48 UTC (rev 13641)
+++ search_server/trunk/servlet/src/main/webapp/WEB-INF/web.xml	2013-02-28 11:05:41 UTC (rev 13642)
@@ -19,6 +19,10 @@
 <servlet-name>SearchServerServlet</servlet-name>
 <servlet-class>org.musicbrainz.search.servlet.SearchServerServlet</servlet-class>
   <init-param>
+        <param-name>init</param-name>
+        <param-value>mmap</param-value>
+  </init-param>
+  <init-param>
      <param-name>index_dir</param-name>
      <param-value>/home/search/indexdata</param-value>
   </init-param>