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

[MCOMPILER-346] workaround to jdk bug: assertion error from javaxcompiler javax.tools API #97

Merged
merged 2 commits into from
Mar 6, 2022
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 @@ -68,7 +68,7 @@ under the License.
! The following property is used in the integration tests MCOMPILER-157
-->
<mavenPluginPluginVersion>3.5</mavenPluginPluginVersion>
<plexusCompilerVersion>2.10.0</plexusCompilerVersion>
<plexusCompilerVersion>2.11.0</plexusCompilerVersion>

<groovyVersion>2.4.21</groovyVersion>
<groovyEclipseCompilerVersion>3.7.0</groovyEclipseCompilerVersion>
Expand Down
20 changes: 20 additions & 0 deletions src/it/MCOMPILER-346/invoker.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

invoker.java.version = 11+
invoker.goals = clean compile
invoker.buildResult = failure
63 changes: 63 additions & 0 deletions src/it/MCOMPILER-346/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
~ regarding copyright ownership. The ASF licenses this file
~ to you under the Apache License, Version 2.0 (the
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.basilcrow</groupId>
<artifactId>MCOMPILER-346-mre</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<name>MCOMPILER-346 Minimal Reproducible Example (MRE)</name>
<url>https://github.com/basil/MCOMPILER-346-mre</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>remoting</artifactId>
<version>3.2</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<release>11</release>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,212 @@
package org.jenkinsci.test.acceptance.server;

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import javax.inject.Inject;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.Executors;

import org.jenkinsci.remoting.RoleChecker;
import org.jenkinsci.test.acceptance.controller.IJenkinsController;
import org.jenkinsci.test.acceptance.controller.JenkinsController;
import org.jenkinsci.test.acceptance.controller.LocalController.LocalFactoryImpl;
import org.jenkinsci.test.acceptance.log.LogListenable;
import org.jenkinsci.test.acceptance.log.LogListener;
import org.jenkinsci.test.acceptance.log.LogSplitter;

import com.cloudbees.sdk.extensibility.Extension;
import com.google.inject.Injector;

import hudson.remoting.Callable;
import hudson.remoting.Channel;
import hudson.remoting.Channel.Mode;
import hudson.remoting.ChannelBuilder;
import jnr.unixsocket.UnixSocketAddress;
import jnr.unixsocket.UnixSocketChannel;
import static java.lang.System.*;

/**
* {@link JenkinsController} that talks to {@link JenkinsControllerPoolProcess} over Unix domain socket.
*
* @author Kohsuke Kawaguchi
*/
public class PooledJenkinsController extends JenkinsController implements LogListenable {
private URL url;
private final File socket;
private UnixSocketChannel conn;
private final LogSplitter splitter = new LogSplitter();
private Channel channel;
private IJenkinsController controller;
private final List<byte[]> toUnpack = new LinkedList<>();

public PooledJenkinsController(Injector i, File socket) {
super(i);
this.socket = socket;
}

@Override
public void addLogListener(LogListener l) {
splitter.addLogListener(l);
}

@Override
public void removeLogListener(LogListener l) {
splitter.removeLogListener(l);
}

private boolean connect() throws IOException {
if (conn != null) return false;

System.out.println("Requesting jut instance using socket " + socket.getAbsolutePath());
UnixSocketAddress address = new UnixSocketAddress(socket);
conn = UnixSocketChannel.open(address);

channel = new ChannelBuilder("JenkinsPool", Executors.newCachedThreadPool())
.withMode(Mode.BINARY)
.build(ChannelStream.in(conn), ChannelStream.out(conn));

try {
controller = (IJenkinsController)channel.waitForRemoteProperty("controller");
controller.start();
url = controller.getUrl();

if (!isQuite) {
splitter.addLogListener(getLogPrinter());
}

final LogListener l = channel.export(LogListener.class, splitter);
channel.call(new InstallLogger(controller,l));

for (byte[] content : toUnpack) {
controller.populateJenkinsHome(content, false);
}
toUnpack.clear();
} catch (InterruptedException e) {
throw new IOException(e);
}

return true;
}

@Override
public void startNow() throws IOException {
connect();
}

@Override
public void stopNow() throws IOException {
controller.stop();
}

@Override
public void populateJenkinsHome(byte[] template, boolean clean) throws IOException {
if (controller != null) {
controller.populateJenkinsHome(template, clean);
} else {
if (clean) {
throw new UnsupportedOperationException("clean mode unsupported for now");
}
toUnpack.add(template);
}
}

@Override
public URL getUrl() {
if (url==null)
throw new IllegalStateException("This controller has not been started");
return url;
}

@Override
public void tearDown() throws IOException {
channel.close();
try {
channel.join(3000);
} catch (InterruptedException e) {
throw new IOException(e);
} finally {
if (conn !=null)
conn.close();
conn = null;
}
}

@Override
public void diagnose(Throwable cause) {
// TODO: Report jenkins log
cause.printStackTrace(out);
if(getenv("INTERACTIVE") != null && getenv("INTERACTIVE").equals("true")){
out.println("Commencing interactive debugging. Browser session was kept open.");
out.println("Press return to proceed.");
try {
in.read();
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}

@Extension
public static class FactoryImpl extends LocalFactoryImpl {
@Inject Injector i;

@Override
public String getId() {
return "pool";
}

@Override
public JenkinsController create() {
return i.getInstance(PooledJenkinsController.class);
}
}

/**
* Runs on the pool server to install logger.
*/
private static class InstallLogger implements Callable<Void, IOException> {
private final IJenkinsController controller;
private final LogListener l;

private InstallLogger(IJenkinsController controller, LogListener l) {
this.controller = controller;
this.l = l;
}

@Override
public Void call() throws IOException {
if (controller instanceof LogListenable) {
LogListenable ll = (LogListenable) controller;
ll.addLogListener(l);
}
return null;
}

@Override
public void checkRoles(RoleChecker checker) throws SecurityException {
}

private static final long serialVersionUID = 1L;
}
}
25 changes: 25 additions & 0 deletions src/it/MCOMPILER-346/verify.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

def logFile = new File( basedir, 'build.log' )
assert logFile.exists()
content = logFile.text

assert content.contains( 'package org.jenkinsci.test.acceptance.controller does not exist' )
assert content.contains( 'package org.jenkinsci.test.acceptance.log does not exist' )