Feature/upgrade to latest junix socket dependency by padas2 · Pull Request #1159 · docker-java/docker-java

padas2 · 2019-02-05T06:29:06Z

Upgrading the version of junixsocket dependencies

This change is

…f junixsocket-common

dbyron0 · 2019-02-05T16:23:20Z

Is kohlschutter/junixsocket#31 relevant? Perhaps with version 2.1.0 (or maybe 2.1.2 to get the latest), we no longer need to monkey patch junixsocket here and can delete https://github.com/docker-java/docker-java/blob/master/src/main/java/org/newsclub/net/unix/AFUNIXSocketImpl.java ? And if we do, I bet we don't need AFUnixSocketException either.

codecov-io · 2019-02-06T10:14:00Z

Codecov Report

Merging #1159 into master will decrease coverage by 0.23%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##           master   #1159      +/-   ##
=========================================
- Coverage   58.64%   58.4%   -0.24%     
=========================================
  Files         451     450       -1     
  Lines        8893    8715     -178     
  Branches      545     525      -20     
=========================================
- Hits         5215    5090     -125     
+ Misses       3382    3349      -33     
+ Partials      296     276      -20

Impacted Files	Coverage Δ
.../com/github/dockerjava/jaxrs/ApacheUnixSocket.java	`0% <0%> (-42.7%)`	⬇️
.../dockerjava/jaxrs/UnixConnectionSocketFactory.java	`35.71% <0%> (-35.72%)`	⬇️
...ub/dockerjava/netty/NettyDockerCmdExecFactory.java	`43.69% <0%> (-12.61%)`	⬇️
...ava/netty/handler/FramedResponseStreamHandler.java	`81.03% <0%> (-3.45%)`	⬇️
...b/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java	`55.67% <0%> (-0.52%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7b249ad...b8b1693. Read the comment docs.

padas2 · 2019-02-06T10:14:16Z

Is kohlschutter/junixsocket#31 relevant? Perhaps with version 2.1.0 (or maybe 2.1.2 to get the latest), we no longer need to monkey patch junixsocket here and can delete https://github.com/docker-java/docker-java/blob/master/src/main/java/org/newsclub/net/unix/AFUNIXSocketImpl.java ? And if we do, I bet we don't need AFUnixSocketException either.

padas2 · 2019-02-06T10:16:25Z

Removed AFUNIXSocketImpl and AFUNIXSocketException classes. Compilation passed. Waiting for travis build results.

KostyaSha · 2019-02-06T10:52:16Z

all socket based tests failed...

KostyaSha · 2019-02-06T11:30:10Z

CHANGELOG.md

 Change Log
 ===

+## 3.1.0-rc-9


3.1.1 even already released....

Updated changelog

Are the socket based test failures because of these changes ?

no, released version passing unix/tcp tests (beside 2 configurations). This PR fails because amd64 native libs not found something

I see this error
Caused by: java.lang.NoClassDefFoundError: Could not initialize class org.newsclub.net.unix.NativeUnixSocket

But I believe this class should be available

KostyaSha · 2019-02-06T12:12:35Z

java.lang.UnsatisfiedLinkError: Artifact junixsocket-native-common does not contain library for amd64-Linux at org.newsclub.net.unix.NativeLibraryLoader.findLibraryArtifact(NativeLibraryLoader.java:70) at org.newsclub.net.unix.NativeLibraryLoader.loadLibrary(NativeLibraryLoader.java:127) at org.newsclub.net.unix.NativeUnixSocket.<clinit>(NativeUnixSocket.java:37) at org.newsclub.net.unix.AFUNIXSocket.<init>(AFUNIXSocket.java:37) at org.newsclub.net.unix.AFUNIXSocket.newInstance(AFUNIXSocket.java:56) at com.github.dockerjava.jaxrs.ApacheUnixSocket.<init>(ApacheUnixSocket.java:51) at com.github.dockerjava.jaxrs.UnixConnectionSocketFactory.createSocket(UnixConnectionSocketFactory.java:66) at org.apache.http.impl.conn.DefaultHttpClientConnectionOperator.connect(DefaultHttpClientConnectionOperator.java:119) at org.apache.http.impl.conn.PoolingHttpClientConnectionManager.connect(PoolingHttpClientConnectionManager.java:373) at org.apache.http.impl.execchain.MainClientExec.establishRoute(MainClientExec.java:394) at org.apache.http.impl.execchain.MainClientExec.execute(MainClientExec.java:237) at org.apache.http.impl.execchain.ProtocolExec.execute(ProtocolExec.java:185) at org.apache.http.impl.execchain.RetryExec.execute(RetryExec.java:89) at org.apache.http.impl.execchain.RedirectExec.execute(RedirectExec.java:110) at org.apache.http.impl.client.InternalHttpClient.doExecute(InternalHttpClient.java:185) at org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:72) at org.glassfish.jersey.apache.connector.ApacheConnector.apply(ApacheConnector.java:450) at org.glassfish.jersey.client.ClientRuntime.invoke(ClientRuntime.java:278) at org.glassfish.jersey.client.JerseyInvocation.lambda$invoke$1(JerseyInvocation.java:767) at org.glassfish.jersey.internal.Errors.process(Errors.java:316) at org.glassfish.jersey.internal.Errors.process(Errors.java:298) at org.glassfish.jersey.internal.Errors.process(Errors.java:229) at org.glassfish.jersey.process.internal.RequestScope.runInScope(RequestScope.java:414) at org.glassfish.jersey.client.JerseyInvocation.invoke(JerseyInvocation.java:765) at org.glassfish.jersey.client.JerseyInvocation$Builder.method(JerseyInvocation.java:428) at org.glassfish.jersey.client.JerseyInvocation$Builder.get(JerseyInvocation.java:324) at com.github.dockerjava.jaxrs.InspectImageCmdExec.execute(InspectImageCmdExec.java:27) at com.github.dockerjava.jaxrs.InspectImageCmdExec.execute(InspectImageCmdExec.java:13) at com.github.dockerjava.jaxrs.AbstrSyncDockerCmdExec.exec(AbstrSyncDockerCmdExec.java:23) at com.github.dockerjava.core.command.AbstrDockerCmd.exec(AbstrDockerCmd.java:35) at com.github.dockerjava.core.command.InspectImageCmdImpl.exec(InspectImageCmdImpl.java:40) at com.github.dockerjava.junit.DockerRule.before(DockerRule.java:80) at org.junit.rules.ExternalResource$1.evaluate(ExternalResource.java:46) at org.junit.rules.RunRules.evaluate(RunRules.java:20) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290) at org.apache.maven.surefire.junitcore.pc.Scheduler$1.run(Scheduler.java:393) at org.apache.maven.surefire.junitcore.pc.InvokerStrategy.schedule(InvokerStrategy.java:54) at org.apache.maven.surefire.junitcore.pc.Scheduler.schedule(Scheduler.java:352) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268) at org.junit.runners.ParentRunner.run(ParentRunner.java:363) at org.junit.runners.Suite.runChild(Suite.java:128) at org.junit.runners.Suite.runChild(Suite.java:27) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290) at org.apache.maven.surefire.junitcore.pc.Scheduler$1.run(Scheduler.java:393) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at jav

dbyron0 · 2019-02-06T17:49:26Z

pom.xml


 		<bouncycastle.version>1.60</bouncycastle.version>
-		<junixsocket.version>2.0.4</junixsocket.version>
+		<junixsocket.version>2.1.0</junixsocket.version>


Suggested change

<junixsocket.version>2.1.0</junixsocket.version>

<junixsocket.version>2.1.2</junixsocket.version>

Does this by chance make the failure go away?

Please update to 2.2.0 (the latest version)

…endency

dbyron0 · 2019-02-19T05:44:17Z

pom.xml


 		<bouncycastle.version>1.60</bouncycastle.version>
-		<junixsocket.version>2.0.4</junixsocket.version>
+		<junixsocket.version>2.1.2</junixsocket.version>


Suggested change

<junixsocket.version>2.1.2</junixsocket.version>

<junixsocket.version>2.2.0</junixsocket.version>

Let's see if this gets us farther. Also see kohlschutter/junixsocket#31 (comment) for more suggestions.

Yes, please directly update to 2.2.0. There's no point in moving anymore.

engadmin added 4 commits February 4, 2019 18:37

Upgrading docker-java from 2.0.4 to 2.1.0

68c6750

Logged the changes in ChangeLog.md as well

2b5557e

Added AFUNIXSocketException class which is missing in 2.1.0 version o…

430468f

…f junixsocket-common

Adding whitespaces to appease the maven checkstyle plugin

85382c3

Removing AFUNIXSocketImpl and AFUNIXSocketException classes

861b458

KostyaSha reviewed Feb 6, 2019

View reviewed changes

dbyron0 reviewed Feb 6, 2019

View reviewed changes

KostyaSha added 2 commits February 6, 2019 21:00

Update pom.xml

a735ccf

Merge branch 'master' into feature/upgrade-to-latest-junix-socket-dep…

b8b1693

…endency

dbyron0 reviewed Feb 19, 2019

View reviewed changes

KostyaSha added this to the 3.1.2 milestone Feb 19, 2019

KostyaSha merged commit 89b80a9 into docker-java:master Feb 19, 2019

	<junixsocket.version>2.1.0</junixsocket.version>
	<junixsocket.version>2.1.2</junixsocket.version>

	<junixsocket.version>2.1.2</junixsocket.version>
	<junixsocket.version>2.2.0</junixsocket.version>

Conversation

padas2 commented Feb 5, 2019 • edited by marcuslinke Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dbyron0 commented Feb 5, 2019

Uh oh!

codecov-io commented Feb 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

padas2 commented Feb 6, 2019

Uh oh!

padas2 commented Feb 6, 2019

Uh oh!

KostyaSha commented Feb 6, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KostyaSha commented Feb 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

padas2 commented Feb 5, 2019 •

edited by marcuslinke

Loading

codecov-io commented Feb 6, 2019 •

edited

Loading

KostyaSha commented Feb 6, 2019 •

edited

Loading