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

Failure to merge: winp sometimes kills random processes when using killRecursive #22

Closed
benhumphreys opened this Issue Jul 16, 2015 · 8 comments

Comments

Projects
None yet
4 participants
@benhumphreys

The following issue describes a problem still present in winp due to a failure to merge the pull request correctly: winp sometimes kills random processes when using killRecursive

Specifically this pull request was not correctly merged: #8

A simple check would seem to indicate the commit was merged:

$ git tag --contains 27a1f7ca64f4dfa0f243dfc834e671ffc3c0b8b9
1.23-beta
winp-1.17
winp-1.18
winp-1.19
winp-1.20
winp-1.21
winp-1.22
winp-1.23

However the merge (b859526) actually reverted the change during the merge. Note that native/winp.cpp is listed as a conflict. It would appear a merge strategy "ours" was used to resolve the conflict, hence discarding the change.

We encountered this problem only recently because we have been using the 1.17-atlassian1 release of winp (found here https://github.com/bturner/winp/tree/winp-1.17-atlassian1), which does include a fix for the issue, for a long time. We recently upgraded to the 1.19 release from the primary winp repository and have been seeing this problem since.

@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev

oleg-nenashev Jul 16, 2015

Collaborator

You are not the first one.
#18 seems to be a related issue. Thanks a lot for the analysis. Hopefully I or @kohsuke finally find some time to handle it.

Collaborator

oleg-nenashev commented Jul 16, 2015

You are not the first one.
#18 seems to be a related issue. Thanks a lot for the analysis. Hopefully I or @kohsuke finally find some time to handle it.

@gorrus

This comment has been minimized.

Show comment
Hide comment
@gorrus

gorrus Jul 16, 2015

Contributor

awesome!

Contributor

gorrus commented Jul 16, 2015

awesome!

@gorrus

This comment has been minimized.

Show comment
Hide comment
@gorrus

gorrus Sep 11, 2015

Contributor

any news on this?

Contributor

gorrus commented Sep 11, 2015

any news on this?

@segrey

This comment has been minimized.

Show comment
Hide comment
@segrey

segrey Oct 29, 2015

Any updates/workarounds?

segrey commented Oct 29, 2015

Any updates/workarounds?

@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev

oleg-nenashev Oct 29, 2015

Collaborator

Unfortunately, no. Have not found time to handle the issue on this summer and then forgotten about it. My apologies.

Collaborator

oleg-nenashev commented Oct 29, 2015

Unfortunately, no. Have not found time to handle the issue on this summer and then forgotten about it. My apologies.

@oleg-nenashev oleg-nenashev self-assigned this Oct 29, 2015

@oleg-nenashev

This comment has been minimized.

Show comment
Hide comment
@oleg-nenashev

oleg-nenashev Oct 29, 2015

Collaborator

I'll try to remerge it later today

Collaborator

oleg-nenashev commented Oct 29, 2015

I'll try to remerge it later today

@segrey

This comment has been minimized.

Show comment
Hide comment
@segrey

segrey Oct 29, 2015

Cool, thanks for the update!

segrey commented Oct 29, 2015

Cool, thanks for the update!

@gorrus

This comment has been minimized.

Show comment
Hide comment
@gorrus

gorrus Nov 25, 2015

Contributor

this is still valid, please do something

Contributor

gorrus commented Nov 25, 2015

this is still valid, please do something

oleg-nenashev added a commit to oleg-nenashev/jenkins that referenced this issue Nov 6, 2016

Update winp to 1.24. In particular, it addresses issues like [JENKINS…
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913)

### Changes to be picked

### 1.24

Release date: Nov 2, 2016

* [Issue #22](kohsuke/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](kohsuke/winp#23))
* [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](kohsuke/winp#20))
* [Issue #24](kohsuke/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](kohsuke/winp#25))
* [Issue #26](kohsuke/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](kohsuke/winp#27))

### 1.23

Release date: Fev 16, 2015

* Migrate native components to Visual Studio Community 2013. ([PR #14](kohsuke/winp#14))
* Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](kohsuke/winp#12))

oleg-nenashev added a commit to jenkinsci/jenkins that referenced this issue Nov 27, 2016

Update winp to 1.24. In particular, it addresses issues like [JENKINS…
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) (#2619)

### Changes to be picked

### 1.24

Release date: Nov 2, 2016

* [Issue #22](kohsuke/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](kohsuke/winp#23))
* [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](kohsuke/winp#20))
* [Issue #24](kohsuke/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](kohsuke/winp#25))
* [Issue #26](kohsuke/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](kohsuke/winp#27))

### 1.23

Release date: Fev 16, 2015

* Migrate native components to Visual Studio Community 2013. ([PR #14](kohsuke/winp#14))
* Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](kohsuke/winp#12))

olivergondza added a commit to jenkinsci/jenkins that referenced this issue Dec 6, 2016

Update winp to 1.24. In particular, it addresses issues like [JENKINS…
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) (#2619)

### Changes to be picked

### 1.24

Release date: Nov 2, 2016

* [Issue #22](kohsuke/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](kohsuke/winp#23))
* [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](kohsuke/winp#20))
* [Issue #24](kohsuke/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](kohsuke/winp#25))
* [Issue #26](kohsuke/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](kohsuke/winp#27))

### 1.23

Release date: Fev 16, 2015

* Migrate native components to Visual Studio Community 2013. ([PR #14](kohsuke/winp#14))
* Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](kohsuke/winp#12))
(cherry picked from commit 63c2f6c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment