TIKA-4809: Remove vestigial -spawnChild-era CLI options and config fields

Author: tballison

tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerConfig.java

@@ -40,13 +40,7 @@ public class TikaServerConfig {
     public static final int DEFAULT_PORT = 9998;
     public static final String DEFAULT_HOST = "localhost";
     public static final Set<String> LOG_LEVELS = new HashSet<>(Arrays.asList("debug", "info"));
-    /**
-     * Number of milliseconds to wait for forked process to startup
-     */
-    public static final long DEFAULT_FORKED_STARTUP_MILLIS = 120000;
     private static final Logger LOG = LoggerFactory.getLogger(TikaServerConfig.class);
-    //used in fork mode -- restart after processing this many files
-    private static final long DEFAULT_MAX_FILES = 100000;
     private static final int DEFAULT_DIGEST_MARK_LIMIT = 20 * 1024 * 1024;
     /**
      * Endpoints that expose the pipes/fetch machinery (process-isolated pipes
@@ -58,9 +52,6 @@ public class TikaServerConfig {
      */
     private static final Set<String> ENDPOINTS_REQUIRING_PIPES =
             new HashSet<>(Arrays.asList("pipes", "async"));
-    private static final List<String> ONLY_IN_FORK_MODE = Arrays.asList(
-            new String[]{"maxFiles", "javaPath", "maxRestarts", "numRestarts", "forkedStatusFile", "maxForkedStartupMillis",
-                    "tmpFilePrefix"});
     private static Pattern SYS_PROPS = Pattern.compile("\\$\\{sys:([-_0-9A-Za-z]+)\\}");
     /*
 TODO: integrate these settings:

tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java

@@ -113,11 +113,6 @@ private static Options getOptions() {
         options.addOption("a", "pluginsConfig", true, "Tika Configuration json for pluginscomponents");
         options.addOption("i", "id", true, "id to use for server in server status endpoint");
         options.addOption("?", "help", false, "this help message");
-        options.addOption("noFork", "noFork", false, "if launched in no fork mode");
-        options.addOption("forkedStatusFile", true,
-                "Not allowed in -noFork: temporary file used to communicate " + "with forking process -- do not use this! " + "Should only be invoked by forking process.");
-        options.addOption("tmpFilePrefix", true, "Not allowed in -noFork: prefix for temp file - for debugging only");
-        options.addOption("numRestarts", true, "Not allowed in -noFork: number of times that " + "the forked server has had to be restarted.");
         return options;
     }
 

tika-server/tika-server-core/src/main/resources/tika-server-config-default.xml

@@ -47,34 +47,9 @@
       <!-- whether or not to include the stacktrace when a parse exception happens
           in the data returned to the user -->
       <returnStackTrace>false</returnStackTrace>
-      <!-- If set to 'true', this runs tika server "in process"
-          in the legacy 1.x mode.
-          This means that the server will be susceptible to infinite loops
-          and crashes.
-          If set to 'false', the server will spawn a forked
-          process and restart the forked process on catastrophic failures
-          (this was called -spawnChild mode in 1.x).
-          nofork=false is the default in 2.x
-      -->
-      <noFork>false</noFork>
-      <!-- maximum amount of time to wait for a forked process to
-          start up.
-          Not allowed if nofork=true. -->
-      <maxForkedStartupMillis>120000</maxForkedStartupMillis>
-      <!-- maximum number of times to allow a specific forked process
-          to be restarted.
-          Not allowed if nofork=true. -->
-      <maxRestarts>-1</maxRestarts>
-      <!-- maximum files to parse per forked process before
-          restarting the forked process to clear potential
-          memory leaks.
-          Not allowed if nofork=true. -->
-      <maxFiles>100000</maxFiles>
-      <!-- if you want to specify a specific javaPath for
-          the forked process.  This should be the full path
-          including the executable, e.g.: /usr/bin/java
-          Not allowed if nofork=true. -->
-      <javaPath>java</javaPath>
+      <!-- Per-document process isolation, crash restart, and timeouts are
+          configured via the pipes section (pipes.forkedJvmArgs,
+          pipes.numClients) and parse-context.timeout-limits, not here. -->
     </params>
   </server>
 </properties>

tika-server/tika-server-core/src/test/resources/configs/tika-config-timeout-100ms.json

@@ -62,7 +62,6 @@ public class TikaResourceTest extends CXFTestBase {
     public static final String TEST_DOC = "test-documents/test.doc";
     public static final String TEST_PASSWORD_PROTECTED = "test-documents/password.xls";
     private static final String TEST_RECURSIVE_DOC = "test-documents/test_recursive_embedded.docx";
-    private static final String TEST_OOM = "mock/fake_oom.xml";
 
     private static final String TIKA_PATH = "/tika";
     private static final int UNPROCESSEABLE = 422;