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

[FIXED JENKINS-9104] Veto killing mspdbsrv.exe #19

Merged
merged 1 commit into from
Jan 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.565.1</version>
<version>1.625</version>
</parent>

<artifactId>msbuild</artifactId>
Expand Down
66 changes: 66 additions & 0 deletions src/main/java/hudson/plugins/msbuild/MsBuildKillingVeto.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2014, Kyle Sweeney, Gregory Boissinot and other contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package hudson.plugins.msbuild;

import hudson.Extension;
import hudson.util.ProcessKillingVeto;
import hudson.util.ProcessTreeRemoting.IOSProcess;

import java.util.List;

import org.apache.commons.io.FilenameUtils;

/**
* An extension that avoids mspdbsrv.exe being killed by Jenkins.
*
* Requires a Jenkins version >= 1.619. Will simply be ignored for older versions.
*
* @see JENKINS-9104
*
* @author Daniel Weber <[email protected]>
*/
@Extension(optional = true)
Copy link
Member

Choose a reason for hiding this comment

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

No need for this to be marked optional, or the Javadoc comment above, as the minimum Jenkins version for this plugin now is 1.625.

public class MsBuildKillingVeto extends ProcessKillingVeto {
private static final VetoCause VETO_CAUSE = new VetoCause("MSBuild Plugin vetoes killing mspdbsrv.exe, see JENKINS-9104 for all the details");

/**
*
*/
@Override
public VetoCause vetoProcessKilling(IOSProcess proc) {
if (proc == null)
return null;

List<String> cmdLine = proc.getArguments();
if (cmdLine == null || cmdLine.isEmpty())
return null;

String command = cmdLine.get(0);
String exeName = FilenameUtils.getName(command);
if (exeName.toLowerCase().equals("mspdbsrv.exe")) {
return VETO_CAUSE;
}
return null;
}
}
114 changes: 114 additions & 0 deletions src/test/java/hudson/plugins/msbuild/MsBuildKillingVetoTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2014, Kyle Sweeney, Gregory Boissinot and other contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package hudson.plugins.msbuild;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import hudson.EnvVars;
import hudson.util.ProcessKillingVeto.VetoCause;
import hudson.util.ProcessTree.ProcessCallable;
import hudson.util.ProcessTreeRemoting.IOSProcess;

import java.io.IOException;
import java.util.List;

import org.junit.Before;
import org.junit.Test;

import com.google.common.collect.Lists;

public class MsBuildKillingVetoTest {

private MsBuildKillingVeto testee;

@Before
public void setUp() {
testee = new MsBuildKillingVeto();
}

@Test
public void testSparesMsPDBSrv() {
VetoCause veto = testee.vetoProcessKilling(mockProcess("C:\\Program Files (x86)\\Microsoft Visual Studio\\bin\\mspdbsrv.exe", "something", "else"));
assertNotNull(veto);
assertEquals("MSBuild Plugin vetoes killing mspdbsrv.exe, see JENKINS-9104 for all the details", veto.getMessage());
}

@Test
public void testIgnoresCase() {
VetoCause veto = testee.vetoProcessKilling(mockProcess("C:\\Program Files (x86)\\Microsoft Visual Studio\\bin\\MsPdbSrv.exe", "something", "else"));
assertNotNull(veto);
assertEquals("MSBuild Plugin vetoes killing mspdbsrv.exe, see JENKINS-9104 for all the details", veto.getMessage());
}

@Test
public void testPathDoesNotMatter() {
VetoCause veto = testee.vetoProcessKilling(mockProcess("D:/Tools/mspdbsrv.exe"));
assertNotNull(veto);
assertEquals("MSBuild Plugin vetoes killing mspdbsrv.exe, see JENKINS-9104 for all the details", veto.getMessage());
}

@Test
public void testLeavesOthersAlone() {
assertNull(testee.vetoProcessKilling(mockProcess("D:/Tools/somethingElse.exe")));
assertNull(testee.vetoProcessKilling(mockProcess("C:\\Program Files (x86)\\Microsoft Visual Studio\\bin\\cl.exe")));
assertNull(testee.vetoProcessKilling(mockProcess("C:\\Program Files (x86)\\Microsoft Visual Studio\\bin\\link.exe")));
}

private IOSProcess mockProcess(final String... cmdLine) {
return new IOSProcess() {
public void killRecursively() throws InterruptedException {
}

@Override
public void kill() throws InterruptedException {
}

@Override
public int getPid() {
return 0;
}

@Override
public IOSProcess getParent() {
return null;
}

@Override
public EnvVars getEnvironmentVariables() {
return null;
}

@Override
public List<String> getArguments() {
return Lists.newArrayList(cmdLine);
}

@Override
public <T> T act(ProcessCallable<T> arg0) throws IOException, InterruptedException {
return null;
}
};
}
}