Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,16 @@

import org.apache.amoro.TableFormat;
import org.apache.amoro.TableRuntime;
import org.apache.amoro.process.ActionCoordinator;
import org.apache.amoro.process.TableProcess;
import org.apache.amoro.process.TableProcessStore;
import org.apache.amoro.server.scheduler.PeriodicTableScheduler;
import org.apache.amoro.server.table.TableService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Optional;

/**
* Periodic scheduler that delegates scheduling decisions to an {@link ActionCoordinator}. It
* creates, recovers and retries table processes via {@link ProcessService}.
Expand Down Expand Up @@ -95,8 +98,8 @@ protected boolean enabled(TableRuntime tableRuntime) {
*/
@Override
protected void execute(TableRuntime tableRuntime) {
TableProcess process = coordinator.createTableProcess(tableRuntime);
processService.register(tableRuntime, process);
Optional<TableProcess> process = coordinator.trigger(tableRuntime);
process.ifPresent(p -> processService.register(tableRuntime, p));
}

/**
Expand All @@ -110,16 +113,6 @@ protected void recover(TableRuntime tableRuntime, TableProcessStore processStore
processService.recover(tableRuntime, process);
}

/**
* Retry a failed table process.
*
* @param process process to retry
*/
protected void retry(TableProcess process) {
process = coordinator.retryTableProcess(process);
processService.retry(process);
}

/**
* Get executor delay from coordinator.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.amoro.TableRuntime;
import org.apache.amoro.config.Configurations;
import org.apache.amoro.config.TableConfiguration;
import org.apache.amoro.process.ActionCoordinator;
import org.apache.amoro.process.ProcessEvent;
import org.apache.amoro.process.ProcessStatus;
import org.apache.amoro.process.TableProcess;
Expand Down Expand Up @@ -242,7 +243,7 @@ private void executeOrTraceProcess(TableProcess process) {
"Regular Retry.",
process.getProcessParameters(),
process.getSummary());
scheduler.retry(process);
executeOrTraceProcess(process);
} else {
untrackTableProcessInstance(
process.getTableRuntime().getTableIdentifier(), process.getId());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.apache.amoro.server.process;

import org.apache.amoro.process.ProcessStatus;
import org.apache.amoro.process.TableProcessState;
import org.apache.amoro.process.TableProcessStore;

import java.util.HashMap;
Expand Down Expand Up @@ -189,25 +188,6 @@ public static TableProcessMeta fromTableProcessStore(TableProcessStore tableProc
return tableProcessMeta;
}

@Deprecated
public static TableProcessMeta fromTableProcessState(TableProcessState tableProcessState) {
TableProcessMeta tableProcessMeta = new TableProcessMeta();
tableProcessMeta.setProcessId(tableProcessState.getId());
tableProcessMeta.setTableId(tableProcessState.getTableIdentifier().getId());
tableProcessMeta.setExternalProcessIdentifier(tableProcessState.getExternalProcessIdentifier());
tableProcessMeta.setStatus(tableProcessState.getStatus());
tableProcessMeta.setProcessType(tableProcessState.getAction().getName());
tableProcessMeta.setProcessStage(tableProcessState.getStage().getDesc());
tableProcessMeta.setExecutionEngine(tableProcessState.getExecutionEngine());
tableProcessMeta.setRetryNumber(tableProcessState.getRetryNumber());
tableProcessMeta.setCreateTime(tableProcessState.getStartTime());
tableProcessMeta.setFinishTime(tableProcessState.getEndTime());
tableProcessMeta.setFailMessage(tableProcessState.getFailedReason());
tableProcessMeta.setProcessParameters(tableProcessState.getProcessParameters());
tableProcessMeta.setSummary(tableProcessState.getSummary());
return tableProcessMeta;
}

public static TableProcessMeta of(
long processId,
long tableId,
Expand Down
Loading