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.

Sign up for GitHub

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

[JENKINS-54346] && [JENKINS-55505] #56

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[JENKINS-54346] && [JENKINS-55505] #56

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ce4497
[JENKINS-54346] tee keeps file open
Jan 9, 2019
10bd83a
jResolve ava.io.NotSerializableException:
roel0 Jan 9, 2019
19f531d
[JENKINS-55505] Tee on windows results in corrupt files
roel0 Jan 10, 2019
33c9ce1
Added UglyStream, to make sure the stream is always closed at the end…
roel0 Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 76 additions & 26 deletions src/main/java/org/jenkinsci/plugins/pipeline/utility/steps/fs/TeeStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@
import org.jenkinsci.plugins.workflow.steps.StepExecution;
import org.kohsuke.stapler.DataBoundConstructor;

public class TeeStep extends Step {
public class TeeStep extends Step implements Serializable {
Copy link
Member

Choose a reason for hiding this comment

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

Makes no sense AFAICT, but anyway I think was due to be superseded by #62?


public final String file;
private static final long serialVersionUID = 1;

@DataBoundConstructor
public TeeStep(String file) {
this.file = file;
}

@Override
public StepExecution start(StepContext context) throws Exception {
return new Execution(context, file);
Expand All @@ -66,6 +66,7 @@ public StepExecution start(StepContext context) throws Exception {
private static class Execution extends StepExecution {

private final String file;
private TeeFilter tee;

Execution(StepContext context, String file) {
super(context);
Expand All @@ -85,10 +86,10 @@ public boolean start() throws Exception {
private static final long serialVersionUID = 1;

}

private static class TeeFilter extends ConsoleLogFilter implements Serializable {

private final FilePath f;
private transient OutputStream stream = null;

TeeFilter(FilePath f) {
this.f = f;
Expand All @@ -97,42 +98,93 @@ private static class TeeFilter extends ConsoleLogFilter implements Serializable
@SuppressWarnings("rawtypes")
@Override
public OutputStream decorateLogger(Run build, final OutputStream logger) throws IOException, InterruptedException {
return new TeeOutputStream(logger, append(f));
return new TeeOutputStream(logger, new UglyStream(f));
}

private static final long serialVersionUID = 1;

}
static class UglyStream extends OutputStream {
/** The delegate output stream. */
private final FilePath delegate;

/** @see FilePath#write() */
private static OutputStream append(FilePath fp) throws IOException, InterruptedException {
if (fp.getChannel() == null) {
File f = new File(fp.getRemote()).getAbsoluteFile();
if (!f.getParentFile().exists() && !f.getParentFile().mkdirs()) {
throw new IOException("Failed to create directory " + f.getParentFile());
}
try {
return Files.newOutputStream(f.toPath(), StandardOpenOption.CREATE, StandardOpenOption.APPEND/*, StandardOpenOption.DSYNC*/);
} catch (InvalidPathException e) {
throw new IOException(e);
}
} else {
return fp.act(new MasterToSlaveFileCallable<OutputStream>() {
private static final long serialVersionUID = 1L;
private static final class TeeFile extends MasterToSlaveFileCallable<OutputStream> {
@Override
public OutputStream invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
f = f.getAbsoluteFile();
if (!f.getParentFile().exists() && !f.getParentFile().mkdirs()) {
throw new IOException("Failed to create directory " + f.getParentFile());
}
try {
return new RemoteOutputStream(Files.newOutputStream(f.toPath(), StandardOpenOption.CREATE, StandardOpenOption.APPEND/*, StandardOpenOption.DSYNC*/));
return new RemoteOutputStream(Files.newOutputStream(f.toPath(), StandardOpenOption.CREATE, StandardOpenOption.APPEND, StandardOpenOption.WRITE));
} catch (InvalidPathException e) {
throw new IOException(e);
}
}
});
private static final long serialVersionUID = 1;
}

/** @see FilePath#write() */
private OutputStream append(FilePath fp) throws IOException, InterruptedException {
if (fp.getChannel() == null) {
File f = new File(fp.getRemote()).getAbsoluteFile();
if (!f.getParentFile().exists() && !f.getParentFile().mkdirs()) {
throw new IOException("Failed to create directory " + f.getParentFile());
}
try {
return Files.newOutputStream(f.toPath(), StandardOpenOption.CREATE, StandardOpenOption.APPEND, StandardOpenOption.WRITE);
} catch (InvalidPathException e) {
throw new IOException(e);
}
} else {
return fp.act(new TeeFile());
}
}

UglyStream (FilePath delegate) {
this.delegate = delegate;
}

@Override
public void write(int b) throws IOException {
try {
OutputStream temp = append(delegate);
temp.write(b);
temp.close();
} catch (InterruptedException e) {
}
}

/** {@inheritDoc} */
@Override
public void write(byte[] b) throws IOException {
try {
OutputStream temp = append(delegate);
temp.write(b);
temp.close();
} catch (InterruptedException e) {
}
}

/** {@inheritDoc} */
@Override
public void write(byte[] b, int off, int len) throws IOException {
try {
OutputStream temp = append(delegate);
temp.write(b, off, len);
temp.close();
} catch (InterruptedException e) {
}
}

@Override
public void flush() throws IOException {
}

@Override
public void close() throws IOException {
}
}

private static final long serialVersionUID = 1;

}

@Extension
Expand All @@ -157,7 +209,5 @@ public boolean takesImplicitBlockArgument() {
public String getDisplayName() {
return "Tee output to file";
}

}

}