Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrected path for executor download fallback #1658

Merged
merged 1 commit into from
Dec 15, 2017
Merged

Conversation

ssalinas
Copy link
Member

Previously this was using the task app directory when copying (not unzipping) which does not match what the S3Downloader service does, and does not match what untar does. This updates it to match

@@ -194,7 +194,7 @@ private void downloadRemoteArtifact(RemoteArtifact remoteArtifact, ArtifactManag
if (Objects.toString(fetched.getFileName()).endsWith(".tar.gz")) {
artifactManager.untar(fetched, task.getArtifactPath(remoteArtifact, task.getTaskDefinition().getTaskDirectoryPath()));
} else {
artifactManager.copy(fetched, task.getArtifactPath(remoteArtifact, task.getTaskDefinition().getTaskAppDirectoryPath()), remoteArtifact.getFilename());
artifactManager.copy(fetched, task.getArtifactPath(remoteArtifact, task.getTaskDefinition().getTaskDirectoryPath()), remoteArtifact.getFilename());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this correct in every circumstance? I think we need to combine getTaskDirectoryPath() and targetFolderRelativeToTask() (if present)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nevermind, I forgot that's already happening in getArtifactPath()

@ssalinas ssalinas added the hs_qa label Nov 27, 2017
@ssalinas ssalinas added this to the 0.19.0 milestone Nov 30, 2017
@Jw0x47
Copy link
Contributor

Jw0x47 commented Dec 4, 2017

🚢

@ssalinas ssalinas merged commit f034ae3 into master Dec 15, 2017
@ssalinas ssalinas deleted the executor_download branch December 15, 2017 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants