resolve netty epoll confilct (#366)

baidu · Sep 28, 2023 · a88c46b · a88c46b
1 parent af99c2d
commit a88c46b
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 13 deletions.
diff --git a/spring-cloud-starter-baidu-starlight/pom.xml b/spring-cloud-starter-baidu-starlight/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.baidu.cloud</groupId>
     <artifactId>spring-cloud-starter-baidu-starlight</artifactId>
-    <version>2022.2.1-SNAPSHOT</version>
+    <version>2022.2.2-SNAPSHOT</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Spring Cloud Starlight</description>
@@ -21,7 +21,7 @@
         <spring-cloud.version>Finchley.SR2</spring-cloud.version>
         <!-- plugin versions -->
         <powermock.version>2.0.9</powermock.version>
-        <starlight.version>2022.2.0</starlight.version>
+        <starlight.version>2022.2.2-SNAPSHOT</starlight.version>
     </properties>
 
     <dependencyManagement>

diff --git a/starlight/pom.xml b/starlight/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.baidu.cloud</groupId>
     <artifactId>starlight</artifactId>
-    <version>2022.2.1-SNAPSHOT</version>
+    <version>2022.2.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>

diff --git a/starlight/starlight-all/pom.xml b/starlight/starlight-all/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.baidu.cloud</groupId>
         <artifactId>starlight</artifactId>
-        <version>2022.2.1-SNAPSHOT</version>
+        <version>2022.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>starlight-all</artifactId>

diff --git a/starlight/starlight-api/pom.xml b/starlight/starlight-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.baidu.cloud</groupId>
         <artifactId>starlight</artifactId>
-        <version>2022.2.1-SNAPSHOT</version>
+        <version>2022.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>starlight-api</artifactId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.baidu.cloud</groupId>
             <artifactId>spring-cloud-baidu-thirdparty-commons</artifactId>
-            <version>2022.2.0</version>
+            <version>2023.0.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

diff --git a/starlight/starlight-api/src/main/java/com/baidu/cloud/starlight/api/transport/Peer.java b/starlight/starlight-api/src/main/java/com/baidu/cloud/starlight/api/transport/Peer.java
@@ -18,6 +18,10 @@
 
 import com.baidu.cloud.starlight.api.common.URI;
 import com.baidu.cloud.starlight.api.rpc.Processor;
+import com.baidu.cloud.thirdparty.netty.util.internal.NativeLibraryLoader;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 
 /**
  * Network peer Created by liuruisen on 2019/11/27.
@@ -65,4 +69,24 @@ public interface Peer extends GracefullyShutdown {
      */
     void updateStatus(PeerStatus status);
 
+    /**
+     * starlight中使用的netty so文件与业务应用中使用的要区分开，防止业务也使用netty报错不兼容
+     * issue：https://github.com/baidu/starlight/issues/360
+     */
+    default void updateNettyResourceMetaHome() {
+        try {
+            Class loaderClass = NativeLibraryLoader.class;
+            Field homeFiled = loaderClass.getDeclaredField("NATIVE_RESOURCE_HOME");
+            homeFiled.setAccessible(true);
+            // 去除final修饰符的影响，将字段设为可修改的
+            Field modifiersField = Field.class.getDeclaredField("modifiers");
+            modifiersField.setAccessible(true);
+            modifiersField.setInt(homeFiled, homeFiled.getModifiers() & ~Modifier.FINAL);
+            // 修改字段的内容
+            homeFiled.set(null, "META-INF/native/thirdparty");
+        } catch (Throwable e) {
+            // ignore
+        }
+    }
+
 }
diff --git a/starlight/starlight-core/pom.xml b/starlight/starlight-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.baidu.cloud</groupId>
         <artifactId>starlight</artifactId>
-        <version>2022.2.1-SNAPSHOT</version>
+        <version>2022.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>starlight-core</artifactId>

diff --git a/starlight/starlight-protocol/pom.xml b/starlight/starlight-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.baidu.cloud</groupId>
         <artifactId>starlight</artifactId>
-        <version>2022.2.1-SNAPSHOT</version>
+        <version>2022.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>starlight-protocol</artifactId>

diff --git a/starlight/starlight-protocol/starlight-protocol-brpc/pom.xml b/starlight/starlight-protocol/starlight-protocol-brpc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.baidu.cloud</groupId>
         <artifactId>starlight-protocol</artifactId>
-        <version>2022.2.1-SNAPSHOT</version>
+        <version>2022.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>starlight-protocol-brpc</artifactId>

diff --git a/starlight/starlight-protocol/starlight-protocol-http/pom.xml b/starlight/starlight-protocol/starlight-protocol-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.baidu.cloud</groupId>
         <artifactId>starlight-protocol</artifactId>
-        <version>2022.2.1-SNAPSHOT</version>
+        <version>2022.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>starlight-protocol-http</artifactId>

diff --git a/starlight/starlight-protocol/starlight-protocol-stargate/pom.xml b/starlight/starlight-protocol/starlight-protocol-stargate/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.baidu.cloud</groupId>
         <artifactId>starlight-protocol</artifactId>
-        <version>2022.2.1-SNAPSHOT</version>
+        <version>2022.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>starlight-protocol-stargate</artifactId>

diff --git a/starlight/starlight-serialization/pom.xml b/starlight/starlight-serialization/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.baidu.cloud</groupId>
         <artifactId>starlight</artifactId>
-        <version>2022.2.1-SNAPSHOT</version>
+        <version>2022.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>starlight-serialization</artifactId>

diff --git a/starlight/starlight-transport/pom.xml b/starlight/starlight-transport/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.baidu.cloud</groupId>
         <artifactId>starlight</artifactId>
-        <version>2022.2.1-SNAPSHOT</version>
+        <version>2022.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>starlight-transport</artifactId>

diff --git a/...rlight-transport/src/main/java/com/baidu/cloud/starlight/transport/netty/NettyClient.java b/...rlight-transport/src/main/java/com/baidu/cloud/starlight/transport/netty/NettyClient.java
@@ -135,6 +135,7 @@ public NettyClient(URI uri) {
 
         this.uri = uri;
         INSTANCE_SET.add(this.uri.getAddress());
+        this.updateNettyResourceMetaHome();
     }
 
     @Override

diff --git a/...rlight-transport/src/main/java/com/baidu/cloud/starlight/transport/netty/NettyServer.java b/...rlight-transport/src/main/java/com/baidu/cloud/starlight/transport/netty/NettyServer.java
@@ -89,6 +89,7 @@ public class NettyServer implements ServerPeer {
     public NettyServer(URI uri) {
         this.uri = uri;
         this.rpcChannels = new ConcurrentHashMap<>();
+        this.updateNettyResourceMetaHome();
     }
 
     @Override