Skip to content

Commit

Permalink
prevents multiple jobs for the same resource [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
006627 committed Feb 5, 2020
1 parent c868a48 commit e03ab8b
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 325 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@
import org.roda.core.data.utils.JsonUtils;
import org.roda.core.data.v2.index.sublist.Sublist;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.JobParametersInvalidException;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.JobOperator;
import org.springframework.batch.core.launch.NoSuchJobException;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
import org.springframework.batch.core.repository.JobRestartException;
Expand Down Expand Up @@ -287,14 +289,22 @@ public DenormalizeConfiguration getDenormalizeConfigurationFile(String databaseU
}

@Override
public Boolean createDenormalizeConfigurationFile(String databaseUUID, String collectionUUID, String tableUUID,
public synchronized Boolean createDenormalizeConfigurationFile(String databaseUUID, String collectionUUID, String tableUUID,
DenormalizeConfiguration configuration) {
ControllerAssistant controllerAssistant = new ControllerAssistant() {};
User user = UserUtility.getUser(request);
LogEntryState state = LogEntryState.SUCCESS;

controllerAssistant.checkRoles(user);

// check if there is no job running on table
for (JobExecution runningJobExecution : jobExplorer.findRunningJobExecutions("denormalizeJob")) {
System.out.println(runningJobExecution);
if (runningJobExecution.getJobParameters().getString(ViewerConstants.CONTROLLER_TABLE_ID_PARAM).equals(tableUUID)) {
throw new RESTException("A job is already running on this table", com.google.gwt.http.client.Response.SC_CONFLICT);
}
}

try {
JsonTransformer.writeObjectToFile(configuration,
ViewerConfiguration.getInstance().getDatabasesPath().resolve(databaseUUID)
Expand Down Expand Up @@ -340,13 +350,21 @@ public Boolean deleteDenormalizeConfigurationFile(String databaseUUID, String co
}

@Override
public void run(String databaseUUID, String collectionUUID, String tableUUID) {
public synchronized void run(String databaseUUID, String collectionUUID, String tableUUID) {
ControllerAssistant controllerAssistant = new ControllerAssistant() {};
User user = UserUtility.getUser(request);
LogEntryState state = LogEntryState.SUCCESS;

controllerAssistant.checkRoles(user);

// check if there is no job running on table
for (JobExecution runningJobExecution : jobExplorer.findRunningJobExecutions("denormalizeJob")) {
System.out.println(runningJobExecution);
if (runningJobExecution.getJobParameters().getString(ViewerConstants.CONTROLLER_TABLE_ID_PARAM).equals(tableUUID)) {
throw new RESTException("A job is already running on this table", com.google.gwt.http.client.Response.SC_CONFLICT);
}
}

JobParametersBuilder jobBuilder = new JobParametersBuilder();
jobBuilder.addDate(ViewerConstants.SOLR_SEARCHES_DATE_ADDED, new Date());
jobBuilder.addString(ViewerConstants.INDEX_ID, SolrUtils.randomUUID());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ private void createButtons() {
messages.dataTransformationBtnRunTable());
btnRunConfiguration.setStyleName("btn btn-play");
btnRunConfiguration.addClickHandler(clickEvent -> {
DataTransformationUtils.saveConfiguration(database.getUuid(), denormalizeConfiguration, collectionStatus);
HistoryManager.gotoJobs();
DataTransformationUtils.saveConfiguration(database.getUuid(), denormalizeConfiguration, collectionStatus);
HistoryManager.gotoJobs();
});

btnRunAllConfiguration.setText(messages.dataTransformationBtnRunAll());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.databasepreservation.common.client.ObserverManager;
import com.databasepreservation.common.client.ViewerConstants;
import com.databasepreservation.common.client.common.dialogs.Dialogs;
import com.databasepreservation.common.client.common.visualization.browse.configuration.dataTransformation.TableNode;
import com.databasepreservation.common.client.configuration.observer.CollectionObserver;
import com.databasepreservation.common.client.models.status.collection.CollectionStatus;
Expand All @@ -21,11 +22,15 @@
import com.databasepreservation.common.client.models.structure.ViewerTable;
import com.databasepreservation.common.client.services.CollectionService;
import com.databasepreservation.common.client.widgets.Toast;
import com.google.gwt.core.client.GWT;

import config.i18n.client.ClientMessages;

/**
* @author Gabriel Barros <gbarros@keep.pt>
*/
public class DataTransformationUtils {
public static ClientMessages messages = GWT.create(ClientMessages.class);
private DataTransformationUtils() {}

public static void includeRelatedTable(TableNode childNode, DenormalizeConfiguration denormalizeConfiguration) {
Expand Down Expand Up @@ -92,9 +97,15 @@ public static void saveConfiguration(String databaseUUID, DenormalizeConfigurati
final CollectionObserver collectionObserver = ObserverManager.getCollectionObserver();
collectionObserver.setCollectionStatus(collectionStatus);
CollectionService.Util.call((Void response) -> {
Toast.showInfo("Configuration file",
Toast.showInfo(messages.advancedConfigurationLabelForDataTransformation(),
"Created denormalization configuration file with success for " + denormalizeConfiguration.getTableID());
}, errorMessage -> {
Dialogs.showErrors(messages.advancedConfigurationLabelForDataTransformation(), errorMessage,
messages.basicActionClose());
}).run(databaseUUID,databaseUUID, denormalizeConfiguration.getTableUUID());
}, errorMessage -> {
Dialogs.showErrors(messages.advancedConfigurationLabelForDataTransformation(), errorMessage,
messages.basicActionClose());
}).createDenormalizeConfigurationFile(databaseUUID, databaseUUID, denormalizeConfiguration.getTableUUID(),
denormalizeConfiguration);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ public RESTException(Throwable cause) {
this.status = getResponseStatusCode(cause);
}

public RESTException(String message, int status) {
super(message);
this.status = status;
}

public RESTException(Throwable cause, int status) {
super("Remote exception" + getCauseMessage(cause));
this.status = status;
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit e03ab8b

Please sign in to comment.