You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rocketmq.apache.org by GitBox <gi...@apache.org> on 2018/01/05 11:05:09 UTC
[GitHub] M-AJ closed pull request #215: Optimize network interfaces with cache on boot
M-AJ closed pull request #215: Optimize network interfaces with cache on boot
URL: https://github.com/apache/rocketmq/pull/215
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/common/src/main/java/org/apache/rocketmq/common/MixAll.java b/common/src/main/java/org/apache/rocketmq/common/MixAll.java
index 3a005e6a5..de1902640 100644
--- a/common/src/main/java/org/apache/rocketmq/common/MixAll.java
+++ b/common/src/main/java/org/apache/rocketmq/common/MixAll.java
@@ -16,6 +16,12 @@
*/
package org.apache.rocketmq.common;
+import org.apache.rocketmq.common.annotation.ImportantField;
+import org.apache.rocketmq.common.constant.LoggerName;
+import org.apache.rocketmq.common.help.FAQUrl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -38,11 +44,6 @@
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.rocketmq.common.annotation.ImportantField;
-import org.apache.rocketmq.common.constant.LoggerName;
-import org.apache.rocketmq.common.help.FAQUrl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class MixAll {
private static final Logger log = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME);
@@ -75,6 +76,7 @@
public static final String CID_ONSAPI_PULL_GROUP = "CID_ONSAPI_PULL";
public static final String CID_RMQ_SYS_PREFIX = "CID_RMQ_SYS_";
+ public static final Enumeration<NetworkInterface> NETWORK_INTERFACES = getNetworkInterfaces();
public static final List<String> LOCAL_INET_ADDRESS = getLocalInetAddress();
public static final String LOCALHOST = localhost();
public static final String DEFAULT_CHARSET = "UTF-8";
@@ -358,21 +360,24 @@ public static boolean isPropertiesEqual(final Properties p1, final Properties p2
return p1.equals(p2);
}
- public static List<String> getLocalInetAddress() {
- List<String> inetAddressList = new ArrayList<String>();
+ public static Enumeration<NetworkInterface> getNetworkInterfaces() {
try {
- Enumeration<NetworkInterface> enumeration = NetworkInterface.getNetworkInterfaces();
- while (enumeration.hasMoreElements()) {
- NetworkInterface networkInterface = enumeration.nextElement();
- Enumeration<InetAddress> addrs = networkInterface.getInetAddresses();
- while (addrs.hasMoreElements()) {
- inetAddressList.add(addrs.nextElement().getHostAddress());
- }
- }
+ return NetworkInterface.getNetworkInterfaces();
} catch (SocketException e) {
throw new RuntimeException("get local inet address fail", e);
}
+ }
+ public static List<String> getLocalInetAddress() {
+ List<String> inetAddressList = new ArrayList<String>();
+ Enumeration<NetworkInterface> enumeration = NETWORK_INTERFACES;
+ while (enumeration.hasMoreElements()) {
+ NetworkInterface networkInterface = enumeration.nextElement();
+ Enumeration<InetAddress> addrs = networkInterface.getInetAddresses();
+ while (addrs.hasMoreElements()) {
+ inetAddressList.add(addrs.nextElement().getHostAddress());
+ }
+ }
return inetAddressList;
}
@@ -395,7 +400,7 @@ private static String localhost() {
//Reverse logic comparing to RemotingUtil method, consider refactor in RocketMQ 5.0
public static String getLocalhostByNetworkInterface() throws SocketException {
List<String> candidatesHost = new ArrayList<String>();
- Enumeration<NetworkInterface> enumeration = NetworkInterface.getNetworkInterfaces();
+ Enumeration<NetworkInterface> enumeration = NETWORK_INTERFACES;
while (enumeration.hasMoreElements()) {
NetworkInterface networkInterface = enumeration.nextElement();
diff --git a/common/src/main/java/org/apache/rocketmq/common/UtilAll.java b/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
index 9ed8ab881..3f0714477 100644
--- a/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
+++ b/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
@@ -472,7 +472,7 @@ public static String ipToIPv4Str(byte[] ip) {
public static byte[] getIP() {
try {
- Enumeration allNetInterfaces = NetworkInterface.getNetworkInterfaces();
+ Enumeration allNetInterfaces = MixAll.NETWORK_INTERFACES;
InetAddress ip = null;
byte[] internalIP = null;
while (allNetInterfaces.hasMoreElements()) {
diff --git a/example/src/main/java/org/apache/rocketmq/example/operation/Consumer.java b/example/src/main/java/org/apache/rocketmq/example/operation/Consumer.java
index 6936f1dce..15f8d8383 100644
--- a/example/src/main/java/org/apache/rocketmq/example/operation/Consumer.java
+++ b/example/src/main/java/org/apache/rocketmq/example/operation/Consumer.java
@@ -16,8 +16,6 @@
*/
package org.apache.rocketmq.example.operation;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
@@ -31,6 +29,9 @@
import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.common.message.MessageExt;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
public class Consumer {
public static void main(String[] args) throws InterruptedException, MQClientException {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services