Modifies the Compactor to be a more generic job execution process

assemble/bin/accumulo-cluster

@@ -228,7 +228,7 @@ function start_all() {
     echo "Starting compactors for group $group"
     Q="COMPACTOR_HOSTS_${group}"
     for compactor in ${!Q}; do
-      start_service "$compactor" compactor "-o" "compactor.group=$group"
+      start_service "$compactor" compactor "-o" "compactor.group=$group" "-o" "task.runner.worker.type=COMPACTION"
     done
   done
 
@@ -295,7 +295,7 @@ function start_here() {
       Q="COMPACTOR_HOSTS_${group}"
       for compactor in ${!Q}; do
         if echo "$compactor" | grep -q "^${host}\$"; then
-          start_service "$compactor" compactor "-o" "compactor.group=$group"
+          start_service "$compactor" compactor "-o" "compactor.group=$group" "-o" "task.runner.worker.type=COMPACTION"
         fi
       done
     done
@@ -525,6 +525,14 @@ tserver:
   default:
     - localhost
 
+log_sort_workers:
+  default:
+    - localhost
+
+split_point_workers:
+  default:
+    - localhost
+
 compactor:
   accumulo_meta:
     - localhost

assemble/pom.xml

@@ -186,11 +186,6 @@
       <artifactId>jakarta.xml.bind-api</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-compactor</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-core</artifactId>
@@ -242,6 +237,11 @@
       <artifactId>accumulo-start</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-task-runner</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-tserver</artifactId>

core/src/main/java/org/apache/accumulo/core/conf/Property.java

@@ -1104,65 +1104,48 @@ public enum Property {
           + "also consider configuring the `" + NoDeleteConstraint.class.getName() + "` "
           + "constraint.",
       "2.0.0"),
-  // Compactor properties
-  @Experimental
-  COMPACTOR_PREFIX("compactor.", null, PropertyType.PREFIX,
-      "Properties in this category affect the behavior of the accumulo compactor server.", "2.1.0"),
-  @Experimental
-  COMPACTOR_PORTSEARCH("compactor.port.search", "true", PropertyType.BOOLEAN,
-      "If the compactor.port.client is in use, search higher ports until one is available",
-      "2.1.0"),
-  @Experimental
-  COMPACTOR_CLIENTPORT("compactor.port.client", "9133", PropertyType.PORT,
-      "The port used for handling client connections on the compactor servers", "2.1.0"),
-  COMPACTOR_MIN_JOB_WAIT_TIME("compactor.wait.time.job.min", "1s", PropertyType.TIMEDURATION,
-      "The minimum amount of time to wait between checks for the next compaction job, backing off"
-          + "exponentially until COMPACTOR_MAX_JOB_WAIT_TIME is reached.",
+  // ELASTICITY_TODO: Deprecate CompactionCoordinator properties in a 3.x release
+  TASK_MANAGER_PREFIX("task.manager.", null, PropertyType.PREFIX,
+      "Properties in this category affect the behavior of the Accumulo TaskManager component.",
+      "4.0.0"),
+  TASK_MANAGER_DEAD_COMPACTOR_CHECK_INTERVAL("task.manager.compactor.dead.check.interval", "5m",
+      PropertyType.TIMEDURATION, "The interval at which to check for dead compactors.", "4.0.0"),
+  TASK_MANAGER_TSERVER_COMPACTION_CHECK_INTERVAL("task.manager.tserver.check.interval", "1m",
+      PropertyType.TIMEDURATION,
+      "The interval at which to check the tservers for external compactions.", "4.0.0"),
+  // ELASTICITY_TODO: Deprecate Compactor properties in a 3.x release
+  TASK_RUNNER_PREFIX("task.runner.", null, PropertyType.PREFIX,
+      "Properties in this category affect the behavior of the accumulo TaskRunner server.",
+      "4.0.0"),
+  TASK_RUNNER_CLIENTPORT("task.runner.port.client", "9133", PropertyType.PORT,
+      "The port used for handling client connections on the TaskRunner servers", "4.0.0"),
+  TASK_RUNNER_GROUP_NAME("task.runner.group", Constants.DEFAULT_RESOURCE_GROUP_NAME,
+      PropertyType.STRING, "Resource group name for this Compactor.", "4.0.0"),
+  TASK_RUNNER_MAX_MESSAGE_SIZE("task.runner.message.size.max", "10M", PropertyType.BYTES,
+      "The maximum size of a message that can be sent to a tablet server.", "4.0.0"),
+  TASK_RUNNER_MIN_JOB_WAIT_TIME("task.runner.wait.time.job.min", "1s", PropertyType.TIMEDURATION,
+      "The minimum amount of time to wait between checks for the next job, backing off"
+          + "exponentially until TASK_RUNNER_MAX_JOB_WAIT_TIME is reached.",
       "4.0.0"),
-  COMPACTOR_MAX_JOB_WAIT_TIME("compactor.wait.time.job.max", "5m", PropertyType.TIMEDURATION,
-      "Compactors do exponential backoff when their request for work repeatedly come back empty. "
+  TASK_RUNNER_MAX_JOB_WAIT_TIME("task.runner.wait.time.job.max", "5m", PropertyType.TIMEDURATION,
+      "TaskRunners do exponential backoff when their request for work repeatedly come back empty. "
           + "This is the maximum amount of time to wait between checks for the next compaction job.",
       "4.0.0"),
-  @Experimental
-  COMPACTOR_MINTHREADS("compactor.threads.minimum", "1", PropertyType.COUNT,
-      "The minimum number of threads to use to handle incoming requests.", "2.1.0"),
-  @Experimental
-  COMPACTOR_MINTHREADS_TIMEOUT("compactor.threads.timeout", "0s", PropertyType.TIMEDURATION,
+  TASK_RUNNER_MINTHREADS("task.runner.threads.minimum", "1", PropertyType.COUNT,
+      "The minimum number of threads to use to handle incoming requests.", "4.0.0"),
+  TASK_RUNNER_MINTHREADS_TIMEOUT("task.runner.threads.timeout", "0s", PropertyType.TIMEDURATION,
       "The time after which incoming request threads terminate with no work available.  Zero (0) will keep the threads alive indefinitely.",
-      "2.1.0"),
-  @Experimental
-  COMPACTOR_THREADCHECK("compactor.threadcheck.time", "1s", PropertyType.TIMEDURATION,
-      "The time between adjustments of the server thread pool.", "2.1.0"),
-  @Experimental
-  COMPACTOR_MAX_MESSAGE_SIZE("compactor.message.size.max", "10M", PropertyType.BYTES,
-      "The maximum size of a message that can be sent to a tablet server.", "2.1.0"),
-  @Experimental
-  COMPACTOR_GROUP_NAME("compactor.group", Constants.DEFAULT_RESOURCE_GROUP_NAME,
-      PropertyType.STRING, "Resource group name for this Compactor.", "3.0.0"),
-  // CompactionCoordinator properties
-  @Experimental
-  COMPACTION_COORDINATOR_PREFIX("compaction.coordinator.", null, PropertyType.PREFIX,
-      "Properties in this category affect the behavior of the accumulo compaction coordinator server.",
-      "2.1.0"),
-  @Experimental
-  COMPACTION_COORDINATOR_DEAD_COMPACTOR_CHECK_INTERVAL(
-      "compaction.coordinator.compactor.dead.check.interval", "5m", PropertyType.TIMEDURATION,
-      "The interval at which to check for dead compactors.", "2.1.0"),
-  @Experimental
-  COMPACTION_COORDINATOR_FINALIZER_TSERVER_NOTIFIER_MAXTHREADS(
-      "compaction.coordinator.compaction.finalizer.threads.maximum", "5", PropertyType.COUNT,
-      "The maximum number of threads to use for notifying tablet servers that an external compaction has completed.",
-      "2.1.0"),
-  @Experimental
-  COMPACTION_COORDINATOR_FINALIZER_COMPLETION_CHECK_INTERVAL(
-      "compaction.coordinator.compaction.finalizer.check.interval", "60s",
-      PropertyType.TIMEDURATION,
-      "The interval at which to check for external compaction final state markers in the metadata table.",
-      "2.1.0"),
-  @Experimental
-  COMPACTION_COORDINATOR_TSERVER_COMPACTION_CHECK_INTERVAL(
-      "compaction.coordinator.tserver.check.interval", "1m", PropertyType.TIMEDURATION,
-      "The interval at which to check the tservers for external compactions.", "2.1.0");
+      "4.0.0"),
+  TASK_RUNNER_PORTSEARCH("task.runner.port.search", "true", PropertyType.BOOLEAN,
+      "If the task.runner.port.client is in use, search higher ports until one is available",
+      "4.0.0"),
+  TASK_RUNNER_THREADCHECK("task.runner.threadcheck.time", "1s", PropertyType.TIMEDURATION,
+      "The time between adjustments of the server thread pool.", "4.0.0"),
+  TASK_RUNNER_WORKER_TYPE("task.runner.worker.type", "", PropertyType.STRING,
+      "Property used by the TaskWorker "
+          + "processes that determines which type of tasks it will perform. Valid values are COMPACTION,"
+          + "LOG_SORTING, SPLIT_POINT_CALCULATION",
+      "4.0.0");
 
   private final String key;
   private final String defaultValue;

core/src/main/java/org/apache/accumulo/core/lock/ServiceLockData.java

@@ -41,15 +41,15 @@ public class ServiceLockData implements Comparable<ServiceLockData> {
    */
   public static enum ThriftService {
     CLIENT,
-    COORDINATOR,
-    COMPACTOR,
     FATE,
     GC,
     MANAGER,
     NONE,
     TABLET_INGEST,
     TABLET_MANAGEMENT,
     TABLET_SCAN,
+    TASK_RUNNER,
+    TASK_MANAGER,
     TSERV
   }
 

core/src/main/java/org/apache/accumulo/core/rpc/clients/TaskManagerThriftClient.java

@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.core.rpc.clients;
+
+import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.tasks.thrift.TaskManager.Client;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TaskManagerThriftClient extends ThriftClientTypes<Client>
+    implements ManagerClient<Client> {
+
+  private static Logger LOG = LoggerFactory.getLogger(TaskManagerThriftClient.class);
+
+  public TaskManagerThriftClient(String serviceName) {
+    super(serviceName, new Client.Factory());
+  }
+
+  @Override
+  public Client getConnection(ClientContext context) {
+    return getManagerConnection(LOG, this, context);
+  }
+
+}

core/src/main/java/org/apache/accumulo/core/rpc/clients/CompactorServiceThriftClient.java → core/src/main/java/org/apache/accumulo/core/rpc/clients/TaskRunnerThriftClient.java

@@ -18,11 +18,11 @@
  */
 package org.apache.accumulo.core.rpc.clients;
 
-import org.apache.accumulo.core.compaction.thrift.CompactorService.Client;
+import org.apache.accumulo.core.tasks.thrift.TaskRunner.Client;
 
-public class CompactorServiceThriftClient extends ThriftClientTypes<Client> {
+public class TaskRunnerThriftClient extends ThriftClientTypes<Client> {
 
-  CompactorServiceThriftClient(String serviceName) {
+  TaskRunnerThriftClient(String serviceName) {
     super(serviceName, new Client.Factory());
   }
 

core/src/main/java/org/apache/accumulo/core/rpc/clients/ThriftClientTypes.java

@@ -34,12 +34,6 @@ public abstract class ThriftClientTypes<C extends TServiceClient> {
 
   public static final ClientServiceThriftClient CLIENT = new ClientServiceThriftClient("client");
 
-  public static final CompactorServiceThriftClient COMPACTOR =
-      new CompactorServiceThriftClient("compactor");
-
-  public static final CompactionCoordinatorServiceThriftClient COORDINATOR =
-      new CompactionCoordinatorServiceThriftClient("coordinator");
-
   public static final FateThriftClient FATE = new FateThriftClient("fate");
 
   public static final GCMonitorServiceThriftClient GC = new GCMonitorServiceThriftClient("gc");
@@ -58,6 +52,12 @@ public abstract class ThriftClientTypes<C extends TServiceClient> {
   public static final TabletManagementClientServiceThriftClient TABLET_MGMT =
       new TabletManagementClientServiceThriftClient("tablet");
 
+  public static final TaskRunnerThriftClient TASK_RUNNER =
+      new TaskRunnerThriftClient("task_runner");
+
+  public static final TaskManagerThriftClient TASK_MANAGER =
+      new TaskManagerThriftClient("task_mgr");
+
   /**
    * execute method with supplied client returning object of type R
    *

core/src/main/java/org/apache/accumulo/core/spi/compaction/DefaultCompactionPlanner.java

@@ -99,8 +99,7 @@
  * ]}
  * </pre>
  *
- * Note that the use of 'external' requires that the CompactionCoordinator and at least one
- * Compactor for Queue1 is running.
+ * Note that the use of 'external' at least one Compactor for Queue1 is running.
  * <li>{@code tserver.compaction.major.service.<service>.opts.maxOpen} This determines the maximum
  * number of files that will be included in a single compaction.
  * </ul>

core/src/main/java/org/apache/accumulo/core/tasks/TaskMessage.java

@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.core.tasks;
+
+import org.apache.accumulo.core.tasks.thrift.Task;
+import org.apache.accumulo.core.util.json.ByteArrayToBase64TypeAdapter;
+import org.apache.accumulo.core.util.json.GsonIgnoreExclusionStrategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+/**
+ * Generic object that can be used to transport TaskMessage subclasses over Thrift using the Thrift
+ * Task type. Implementations of this class are serialized to JSON then transported via Task and
+ * deserialized on the other side.
+ */
+public abstract class TaskMessage {
+
+  private static final Logger LOG = LoggerFactory.getLogger(TaskMessage.class);
+
+  @SuppressWarnings("unchecked")
+  public static <T extends TaskMessage> T fromThiftTask(Task task, TaskMessageType expectedType) {
+    TaskMessageType type = TaskMessageType.valueOf(task.getMessageType());
+    Preconditions.checkState(type == expectedType,
+        "Task is of type: " + type + ", expected: " + expectedType);
+    T decodedMsg = (T) TaskMessage.GSON_FOR_TASKS.fromJson(task.getMessage(), type.getTaskClass());
+    LOG.trace("Received {}", TaskMessage.GSON_FOR_TASKS.toJson(decodedMsg));
+    return decodedMsg;
+  }
+
+  private static final Gson GSON_FOR_TASKS =
+      new GsonBuilder().setExclusionStrategies(new GsonIgnoreExclusionStrategy())
+          .registerTypeHierarchyAdapter(byte[].class, new ByteArrayToBase64TypeAdapter()).create();
+
+  private String taskId;
+  private TaskMessageType type;
+
+  public TaskMessage() {}
+
+  public String getTaskId() {
+    return taskId;
+  }
+
+  public void setTaskId(String taskId) {
+    this.taskId = taskId;
+  }
+
+  void setMessageType(TaskMessageType type) {
+    this.type = type;
+  }
+
+  public TaskMessageType getMessageType() {
+    return type;
+  }
+
+  public Task toThriftTask() {
+    Task t = new Task();
+    t.setTaskId(getTaskId());
+    t.setMessageType(getMessageType().name());
+    t.setMessage(TaskMessage.GSON_FOR_TASKS.toJson(this));
+    LOG.trace("Sending {}", TaskMessage.GSON_FOR_TASKS.toJson(this));
+    return t;
+  }
+
+}