Merged
Conversation
YaroslavTir
reviewed
Jul 29, 2020
| LOGGER.warn(Constants.AnalysisMessages.CANT_REMOVE_ANALYSIS_DIR_LOG); | ||
| } | ||
| final AnalysisResultStatusDTO updatedAnalysisStatus = reEvaluateAnalysisStatus(analysis.getStatus(), resultDir); | ||
| exists.setAnalysisFolder(analysis.getAnalysisFolder()); |
There was a problem hiding this comment.
If I am not wrong File analysisFolder = new File(exists.getAnalysisFolder()) and resultDir is prity much the same dir. So basicly dirictory should not exisist before you run reEvaluateAnalysisStatus.
Contributor
Author
There was a problem hiding this comment.
You are wrong, these are two different folders
| } | ||
|
|
||
| private Analysis update(Analysis analysis) throws NotExistException { | ||
| private AnalysisResultStatusDTO reEvaluateAnalysisStatus(AnalysisResultStatusDTO originalStatus, File resultDir){ |
There was a problem hiding this comment.
can you extract evaluate status logic in a separate class?
acumarav
added a commit
that referenced
this pull request
Sep 1, 2020
* ARACHNE-2729 Add IAP auth support into Standalone Node (#392) * set standard authentication mode by default(ARACHNE-2729) (#394) Co-authored-by: Alex Cumarav <tsuria@users.noreply.github.com> Co-authored-by: Alex Cumarav <7705583+acumarav@users.noreply.github.com> Co-authored-by: Konstantin Iaroshovets <konstjar@users.noreply.github.com> Co-authored-by: molodkov yaroslav <yaroslav.molodkov@odysseusinc.com> Co-authored-by: Anton Gackovka <anton.gackovka@odysseusinc.com> Co-authored-by: anastasiia klochkova <38942654+aklochkova@users.noreply.github.com> Co-authored-by: OdysseusBot <34305057+OdysseusBot@users.noreply.github.com> Co-authored-by: mpozhidaeva <31308645+mpozhidaeva@users.noreply.github.com> Co-authored-by: Pavel Grafkin <pavgra@gmail.com> * restore DataNodeModeDTO (#398) * upgrade sqlRender version (#403) * upgrade sqlRender version * upgrade sqlRender version to 1.6.5 * Update pom.xml upgrade SqlRender to version 1.6.6-snapshot * Update pom.xml set 1.6.5 version of SqlRender * fix proxy properties (#405) * clean up (#399) Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> * remove duplications * Datanode password reset (#409) * Datanode password reset * PR comment - add @Valid check Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> * fix config value * upload submission: exceeds the configured maximum [ARACHNE-2818] * ARACHNE-2850 Atlas auth exception was moved to another class (#415) * Atlas auth exception was moved to another class - now is not catched by auth filter Co-authored-by: Sergey Suvorov <sergey.suvorov@odysseusinc.com> * add check atlas check connection for google authentication ARACHNE-2858 * Error message floods into serverlog making it less readable (#416) * Error message floods into serverlog making it less readable.(ARACHNE-2772) * ARACHNE-2853 Make user-friendly error for bad credentials on data node * code review fixes: add handler for org.springframework.security.core.AuthenticationException * ARACHNE-2858 do not wrap atlas auth exception. * update version to 1.16.2-snapshot * update analysis state (#423) * update analysis state * update analysis results logic extraction * update analysis results logic extraction - tests * code clean up Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> Co-authored-by: yaroslavtir <yaroslav.molodkov@odysseusinc.com> * ARACHNE-2772 token invalid Error message floods into log (#424) * ARACHNE-2772 token invalid Error message floods into log Co-authored-by: Alex Cumarav <7705583+acumarav@users.noreply.github.com> * Bump mysql-connector-java from 5.1.30 to 8.0.16 (#414) Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.30 to 8.0.16. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](mysql/mysql-connector-j@5.1.30...8.0.16) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update dependencies and Cohort Characterization skeleton (#425) Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> * Hide datanode datasource id (#426) * hide datanode datasource id from Central Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> Co-authored-by: Alexandr Ryabokon <mr.alexandr.ryabokon@gmail.com> Co-authored-by: Pavel Grafkin <pavgra@gmail.com> Co-authored-by: Vitaly Koulakov <vitaly.koulakov@gmail.com> Co-authored-by: Anton Gackovka <anton.gackovka@odysseusinc.com> Co-authored-by: Anastasiia Klochkova <anastasiia.klochkova@odysseusinc.com> Co-authored-by: OdysseusBot <34305057+OdysseusBot@users.noreply.github.com> Co-authored-by: Maria Pozhidaeva <maria.pozhidaeva@odysseusinc.com> Co-authored-by: mpozhidaeva <31308645+mpozhidaeva@users.noreply.github.com> Co-authored-by: anastasiia klochkova <38942654+aklochkova@users.noreply.github.com> Co-authored-by: molodkov yaroslav <yaroslav.molodkov@odysseusinc.com> Co-authored-by: Alex Cumarav <tsuria@users.noreply.github.com> Co-authored-by: Konstantin Iaroshovets <konstjar@users.noreply.github.com> Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> Co-authored-by: Sergey Suvorov <sergey.suvorov@firstlinesoftware.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
acumarav
added a commit
that referenced
this pull request
Sep 1, 2020
* Qa 1.16.0 fix (#395) * ARACHNE-2729 Add IAP auth support into Standalone Node (#392) * set standard authentication mode by default(ARACHNE-2729) (#394) Co-authored-by: Alex Cumarav <tsuria@users.noreply.github.com> Co-authored-by: Alex Cumarav <7705583+acumarav@users.noreply.github.com> Co-authored-by: Konstantin Iaroshovets <konstjar@users.noreply.github.com> Co-authored-by: molodkov yaroslav <yaroslav.molodkov@odysseusinc.com> Co-authored-by: Anton Gackovka <anton.gackovka@odysseusinc.com> Co-authored-by: anastasiia klochkova <38942654+aklochkova@users.noreply.github.com> Co-authored-by: OdysseusBot <34305057+OdysseusBot@users.noreply.github.com> Co-authored-by: mpozhidaeva <31308645+mpozhidaeva@users.noreply.github.com> Co-authored-by: Pavel Grafkin <pavgra@gmail.com> * restore DataNodeModeDTO (#398) * upgrade sqlRender version (#403) * upgrade sqlRender version * upgrade sqlRender version to 1.6.5 * Update pom.xml upgrade SqlRender to version 1.6.6-snapshot * Update pom.xml set 1.6.5 version of SqlRender * fix proxy properties (#405) * clean up (#399) Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> * remove duplications * Datanode password reset (#409) * Datanode password reset * PR comment - add @Valid check Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> * fix config value * upload submission: exceeds the configured maximum [ARACHNE-2818] * ARACHNE-2850 Atlas auth exception was moved to another class (#415) * Atlas auth exception was moved to another class - now is not catched by auth filter Co-authored-by: Sergey Suvorov <sergey.suvorov@odysseusinc.com> * add check atlas check connection for google authentication ARACHNE-2858 * Error message floods into serverlog making it less readable (#416) * Error message floods into serverlog making it less readable.(ARACHNE-2772) * ARACHNE-2853 Make user-friendly error for bad credentials on data node * code review fixes: add handler for org.springframework.security.core.AuthenticationException * ARACHNE-2858 do not wrap atlas auth exception. * update version to 1.16.2-snapshot * update analysis state (#423) * update analysis state * update analysis results logic extraction * update analysis results logic extraction - tests * code clean up Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> Co-authored-by: yaroslavtir <yaroslav.molodkov@odysseusinc.com> * ARACHNE-2772 token invalid Error message floods into log (#424) * ARACHNE-2772 token invalid Error message floods into log Co-authored-by: Alex Cumarav <7705583+acumarav@users.noreply.github.com> * Bump mysql-connector-java from 5.1.30 to 8.0.16 (#414) Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.30 to 8.0.16. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](mysql/mysql-connector-j@5.1.30...8.0.16) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update dependencies and Cohort Characterization skeleton (#425) Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> * Hide datanode datasource id (#426) * hide datanode datasource id from Central Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> * release candidate 1.16.2 Co-authored-by: Alexandr Ryabokon <mr.alexandr.ryabokon@gmail.com> Co-authored-by: Pavel Grafkin <pavgra@gmail.com> Co-authored-by: Vitaly Koulakov <vitaly.koulakov@gmail.com> Co-authored-by: Anton Gackovka <anton.gackovka@odysseusinc.com> Co-authored-by: Anastasiia Klochkova <anastasiia.klochkova@odysseusinc.com> Co-authored-by: OdysseusBot <34305057+OdysseusBot@users.noreply.github.com> Co-authored-by: Maria Pozhidaeva <maria.pozhidaeva@odysseusinc.com> Co-authored-by: mpozhidaeva <31308645+mpozhidaeva@users.noreply.github.com> Co-authored-by: anastasiia klochkova <38942654+aklochkova@users.noreply.github.com> Co-authored-by: molodkov yaroslav <yaroslav.molodkov@odysseusinc.com> Co-authored-by: Alex Cumarav <tsuria@users.noreply.github.com> Co-authored-by: Konstantin Iaroshovets <konstjar@users.noreply.github.com> Co-authored-by: alexandr cumarav <https://localhost:8080/study-manager/studies/6> Co-authored-by: Sergey Suvorov <sergey.suvorov@firstlinesoftware.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
update analysis status based on the error report presence