mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-10-31 13:35:19 +00:00
[FIXED JENKINS-9540] Failure of recursive copy on slave side should be reported.
Instead it was being thrown in a Future that the master did not wait for: the writing side failed with a closed pipe exception, and this meaningless error was thrown up. Fixing by waiting for the reading side first, so any error there will be thrown up. (If there was _also_ an error on the writing side, we would miss it, but typically this will just be the closed stream.)
This commit is contained in:
1 parent
d75c350c7b
commit
574fe1409e
3 files changed
+51
-2
No files matched your search
@@ -1931,13 +1931,19 @@ public final class FilePath implements Serializable {
|
||||
}
|
||||
}
|
||||
});
|
||||
int r = writeToTar(new File(remote),fileMask,excludes,TarCompression.GZIP.compress(pipe.getOut()));
|
||||
Future<Integer> future2 = actAsync(new FileCallable<Integer>() {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@Override public Integer invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
|
||||
return writeToTar(new File(remote),fileMask,excludes,TarCompression.GZIP.compress(pipe.getOut()));
|
||||
}
|
||||
});
|
||||
try {
|
||||
// JENKINS-9540 in case the reading side failed, report that error first
|
||||
future.get();
|
||||
return future2.get();
|
||||
} catch (ExecutionException e) {
|
||||
throw new IOException2(e);
|
||||
}
|
||||
return r;
|
||||
} else {
|
||||
// remote -> local copy
|
||||
final Pipe pipe = Pipe.createRemoteToLocal();
|
||||
|
||||
Reference in new issue
Block a user