Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve SchedulerClient compliance with Scheduler API (#2736)
* Add result metadata to JavaExecutable * Improve SchedulerClient compliance with Scheduler API - improve the handling of job and task results handling, to allow transparent navigation (job to task, logs, etc). Added correct dozer mappings for job and task results - improve the handling of job info and corrected the metrics which were broken in both Java and Rest apis - implemented a few previously unsupported methods in SchedulerClient class - better handling of the task logs and exception in Task result - Added a test in SchedulerClientTest to test a few accesses to the scheduler api, mostly job result but also job state, job info * Improve SchedulerClient compliance with Scheduler API - fixing unit tests * implement sonar review * implemented reviews
- Loading branch information
Showing
33 changed files
with
896 additions
and
298 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
...est-api/src/main/java/org/ow2/proactive_grid_cloud_portal/scheduler/dto/TaskLogsData.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * * | ||
| * ProActive Parallel Suite(TM): The Java(TM) library for | ||
| * Parallel, Distributed, Multi-Core Computing for | ||
| * Enterprise Grids & Clouds | ||
| * | ||
| * Copyright (C) 1997-2015 INRIA/University of | ||
| * Nice-Sophia Antipolis/ActiveEon | ||
| * Contact: proactive@ow2.org or contact@activeeon.com | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Affero General Public License | ||
| * as published by the Free Software Foundation; version 3 of | ||
| * the License. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this library; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | ||
| * USA | ||
| * | ||
| * If needed, contact us to obtain a release under GPL Version 2 or 3 | ||
| * or a different license than the AGPL. | ||
| * | ||
| * Initial developer(s): The ProActive Team | ||
| * http://proactive.inria.fr/team_members.htm | ||
| * Contributor(s): | ||
| * | ||
| * * $$ACTIVEEON_INITIAL_DEV$$ | ||
| */ | ||
| package org.ow2.proactive_grid_cloud_portal.scheduler.dto; | ||
|
|
||
| import javax.xml.bind.annotation.XmlRootElement; | ||
|
|
||
| @XmlRootElement | ||
| public class TaskLogsData { | ||
|
|
||
| private String stdoutLogs; | ||
| private String stderrLogs; | ||
|
|
||
| public String getStdoutLogs() { | ||
| return stdoutLogs; | ||
| } | ||
|
|
||
| public void setStdoutLogs(String stdoutLogs) { | ||
| this.stdoutLogs = stdoutLogs; | ||
| } | ||
|
|
||
| public String getStderrLogs() { | ||
| return stderrLogs; | ||
| } | ||
|
|
||
| public void setStderrLogs(String stderrLogs) { | ||
| this.stderrLogs = stderrLogs; | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "TaskLogsData{" + "stdoutLogs=" + stdoutLogs + ", stdoutLogs=" + stderrLogs + '}'; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
.../main/java/org/ow2/proactive_grid_cloud_portal/scheduler/exception/TaskRestException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * * | ||
| * ProActive Parallel Suite(TM): The Java(TM) library for | ||
| * Parallel, Distributed, Multi-Core Computing for | ||
| * Enterprise Grids & Clouds | ||
| * | ||
| * Copyright (C) 1997-2015 INRIA/University of | ||
| * Nice-Sophia Antipolis/ActiveEon | ||
| * Contact: proactive@ow2.org or contact@activeeon.com | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Affero General Public License | ||
| * as published by the Free Software Foundation; version 3 of | ||
| * the License. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this library; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | ||
| * USA | ||
| * | ||
| * If needed, contact us to obtain a release under GPL Version 2 or 3 | ||
| * or a different license than the AGPL. | ||
| * | ||
| * Initial developer(s): The ProActive Team | ||
| * http://proactive.inria.fr/team_members.htm | ||
| * Contributor(s): | ||
| * | ||
| * * $$ACTIVEEON_INITIAL_DEV$$ | ||
| */ | ||
| package org.ow2.proactive_grid_cloud_portal.scheduler.exception; | ||
|
|
||
| public class TaskRestException extends RestException { | ||
|
|
||
| public TaskRestException(String message) { | ||
| super(message); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.