This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push: new 7124801 Removing some unnecessary RuntimeExceptions 7124801 is described below commit 712480159c71b151fcfded27e9d03e60d505f7a4 Author: Marcus Christie <machris...@apache.org> AuthorDate: Mon Feb 26 12:57:46 2018 -0500 Removing some unnecessary RuntimeExceptions --- .../main/java/org/apache/airavata/gfac/impl/GFacWorker.java | 4 +--- .../java/org/apache/airavata/gfac/impl/task/ArchiveTask.java | 5 +---- .../apache/airavata/gfac/impl/task/BESJobSubmissionTask.java | 4 +--- .../org/apache/airavata/gfac/impl/task/DataStageTask.java | 2 -- .../org/apache/airavata/gfac/impl/task/DataStreamingTask.java | 2 +- .../airavata/gfac/impl/task/DefaultJobSubmissionTask.java | 8 +++++++- .../apache/airavata/gfac/impl/task/ForkJobSubmissionTask.java | 11 +++++++---- .../airavata/gfac/impl/task/LocalJobSubmissionTask.java | 4 +--- .../org/apache/airavata/gfac/impl/task/SCPDataStageTask.java | 2 -- .../org/apache/airavata/gfac/impl/task/utils/StreamData.java | 4 +--- .../orchestrator/core/validator/impl/BatchQueueValidator.java | 2 +- .../apache/airavata/orchestrator/util/OrchestratorUtils.java | 2 +- 12 files changed, 22 insertions(+), 28 deletions(-) diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacWorker.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacWorker.java index df076cd..ae87b87 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacWorker.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacWorker.java @@ -148,11 +148,9 @@ public class GFacWorker implements Runnable { GFacUtils.saveAndPublishProcessStatus(processContext, registryClient); GFacUtils.saveExperimentError(processContext, registryClient, errorModel); GFacUtils.saveProcessError(processContext, registryClient, errorModel); - } catch (GFacException e1) { + } catch (GFacException|TException e1) { log.error("expId: {}, processId: {} :- Couldn't save and publish process status {}", processContext .getExperimentId(), processContext.getProcessId(), processContext.getProcessState()); - } catch (TException e1) { - throw new RuntimeException("Error", e); } sendAck(); } finally { diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java index 9c312eb..dda430b 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java @@ -88,7 +88,6 @@ public class ArchiveTask implements Task { errorModel.setActualErrorMessage(e.getMessage()); errorModel.setUserFriendlyMessage(msg); taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel)); - throw new RuntimeException(msg, e); } RegistryService.Client registryClient = Factory.getRegistryServiceClient(); @@ -159,7 +158,7 @@ public class ArchiveTask implements Task { errorModel.setActualErrorMessage(e.getMessage()); errorModel.setUserFriendlyMessage(msg); taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel)); - } catch ( URISyntaxException | GFacException e) { + } catch ( URISyntaxException | GFacException | TException e) { String msg = "Error! Archive task failed"; log.error(msg, e); status.setState(TaskState.FAILED); @@ -169,8 +168,6 @@ public class ArchiveTask implements Task { errorModel.setActualErrorMessage(e.getMessage()); errorModel.setUserFriendlyMessage(msg); taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel)); - } catch (TException e) { - throw new RuntimeException("Error ", e); } finally { if (registryClient != null) { ThriftUtils.close(registryClient); diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java index 4e6b2f8..69414bb 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java @@ -137,14 +137,12 @@ public class BESJobSubmissionTask implements JobSubmissionTask { // con't reuse if UserDN has been changed. secProperties = getSecurityConfig(registryClient, processContext); // try secProperties = secProperties.clone() if we can't use already initialized ClientConfigurations. - } catch (GFacException e) { + } catch (GFacException | TException e) { String msg = "Unicorn security context initialization error"; log.error(msg, e); taskStatus.setState(TaskState.FAILED); taskStatus.setReason(msg); return taskStatus; - } catch (TException e) { - throw new RuntimeException("Error ", e); } try { JobSubmissionProtocol protocol = processContext.getJobSubmissionProtocol(); diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java index 41e2e10..9566cd2 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java @@ -20,7 +20,6 @@ package org.apache.airavata.gfac.impl.task; import org.apache.airavata.gfac.core.GFacException; -import org.apache.airavata.gfac.core.SSHApiException; import org.apache.airavata.gfac.core.context.TaskContext; import org.apache.airavata.gfac.core.task.Task; import org.apache.airavata.gfac.core.task.TaskException; @@ -93,7 +92,6 @@ public class DataStageTask implements Task { errorModel.setActualErrorMessage(e.getMessage()); errorModel.setUserFriendlyMessage(msg); taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel)); - throw new RuntimeException(msg, e); } catch (URISyntaxException e) { String msg = "source or destination is not a valid URI"; log.error(msg, e); diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStreamingTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStreamingTask.java index f127d65..72252bb 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStreamingTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStreamingTask.java @@ -91,7 +91,7 @@ public class DataStreamingTask implements Task { return null; } catch (TException e) { log.error("Error while creating data streaming task", e); - throw new RuntimeException("Error while creating data streaming task", e); + return null; } } diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java index 55b0305..d21c753 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java @@ -239,7 +239,13 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask { } catch (ApplicationSettingsException e) { String msg = "Error occurred while creating job descriptor"; log.error(msg, e); - throw new RuntimeException(msg, e); + taskStatus.setState(TaskState.FAILED); + taskStatus.setReason(msg); + taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime()); + ErrorModel errorModel = new ErrorModel(); + errorModel.setActualErrorMessage(e.getMessage()); + errorModel.setUserFriendlyMessage(msg); + taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel)); } catch (GFacException e) { String msg = "Error occurred while submitting the job"; log.error(msg, e); diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ForkJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ForkJobSubmissionTask.java index ffb77d3..dc58ba9 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ForkJobSubmissionTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ForkJobSubmissionTask.java @@ -125,8 +125,13 @@ public class ForkJobSubmissionTask implements JobSubmissionTask { } catch (ApplicationSettingsException e) { String msg = "Error occurred while creating job descriptor"; log.error(msg, e); - throw new RuntimeException(msg, e); - } catch (GFacException e) { + taskStatus.setState(TaskState.FAILED); + taskStatus.setReason(msg); + ErrorModel errorModel = new ErrorModel(); + errorModel.setActualErrorMessage(e.getMessage()); + errorModel.setUserFriendlyMessage(msg); + taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel)); + } catch (GFacException | TException e) { String msg = "Error occurred while submitting the job"; log.error(msg, e); taskStatus.setState(TaskState.FAILED); @@ -144,8 +149,6 @@ public class ForkJobSubmissionTask implements JobSubmissionTask { errorModel.setActualErrorMessage(e.getMessage()); errorModel.setUserFriendlyMessage(msg); taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel)); - } catch (TException e) { - throw new RuntimeException("Error while cancelling job submission", e); } finally { if (registryClient != null) { ThriftUtils.close(registryClient); diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/LocalJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/LocalJobSubmissionTask.java index 4ab00fe..0ecd0bb 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/LocalJobSubmissionTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/LocalJobSubmissionTask.java @@ -140,7 +140,7 @@ public class LocalJobSubmissionTask implements JobSubmissionTask{ } } - } catch (GFacException | IOException | ApplicationSettingsException e) { + } catch (GFacException | IOException | ApplicationSettingsException | TException e) { String msg = "Error occurred while submitting a local job"; log.error(msg, e); taskStatus.setReason(msg); @@ -149,8 +149,6 @@ public class LocalJobSubmissionTask implements JobSubmissionTask{ errorModel.setUserFriendlyMessage(msg); taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel)); taskStatus.setState(TaskState.FAILED); - } catch (TException e) { - throw new RuntimeException("Error ", e); } finally { if (registryClient != null) { ThriftUtils.close(registryClient); diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java index 5cb0d8d..fe5ca45 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java @@ -224,7 +224,6 @@ public class SCPDataStageTask implements Task { errorModel.setActualErrorMessage(e.getMessage()); errorModel.setUserFriendlyMessage(msg); taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel)); - throw new RuntimeException(msg, e); } catch ( FileNotFoundException e) { String msg = "Failed while reading credentials"; log.error(msg, e); @@ -243,7 +242,6 @@ public class SCPDataStageTask implements Task { errorModel.setActualErrorMessage(e.getMessage()); errorModel.setUserFriendlyMessage(msg); taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel)); - throw new RuntimeException(msg, e); } catch (URISyntaxException e) { String msg = "Source or destination uri is not correct source : " + subTaskModel.getSource() + ", " + "destination : " + subTaskModel.getDestination(); diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/StreamData.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/StreamData.java index 3e56bb8..667a2be 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/StreamData.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/StreamData.java @@ -83,7 +83,7 @@ public class StreamData extends TimerTask { log.error("expId: {}, processId:{}, taskId: {}:- Couldn't stage file {} , Erroneous path specified", taskContext.getExperimentId(), taskContext.getProcessId(), taskContext.getTaskId(), taskContext.getProcessOutput().getName()); - } catch (IllegalAccessException | InstantiationException | AiravataException | IOException | JSchException e) { + } catch (IllegalAccessException | InstantiationException | AiravataException | IOException | JSchException | TException e) { log.error("expId: {}, processId:{}, taskId: {}:- Couldn't stage file {} , Error occurred while streaming data", taskContext.getExperimentId(), taskContext.getProcessId(), taskContext.getTaskId(), taskContext.getProcessOutput().getName()); @@ -91,8 +91,6 @@ public class StreamData extends TimerTask { log.error("expId: {}, processId:{}, taskId: {}:- Couldn't stage file {} , Error occurred while connecting with credential store", taskContext.getExperimentId(), taskContext.getProcessId(), taskContext.getTaskId(), taskContext.getProcessOutput().getName()); - } catch (TException e) { - throw new RuntimeException("Error ", e); } } diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java index f49890d..c1768b1 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java @@ -198,7 +198,7 @@ public class BatchQueueValidator implements JobMetadataValidator { return validatorResultList; } - private RegistryService.Client getRegistryServiceClient() throws TException, ApplicationSettingsException { + private RegistryService.Client getRegistryServiceClient() throws ApplicationSettingsException { final int serverPort = Integer.parseInt(ServerSettings.getRegistryServerPort()); final String serverHost = ServerSettings.getRegistryServerHost(); try { diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorUtils.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorUtils.java index 69a2cb8..8ed5150 100644 --- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorUtils.java +++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorUtils.java @@ -59,7 +59,7 @@ public class OrchestratorUtils { } - private static RegistryService.Client getRegistryServiceClient() throws TException, ApplicationSettingsException { + private static RegistryService.Client getRegistryServiceClient() throws ApplicationSettingsException { final int serverPort = Integer.parseInt(ServerSettings.getRegistryServerPort()); final String serverHost = ServerSettings.getRegistryServerHost(); try { -- To stop receiving notification emails like this one, please contact machris...@apache.org.