Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for AMQ-5652: IdGenerator not optimal in port restricted environments. 

We now support configuring via system props activemq.idgenerator.hostname and activemq.idgenerator.localport which are used as the base part of GUIDs.
This commit is contained in:
Hiram Chirino 2015-03-09 13:45:20 -04:00
parent 1c72579d7a
commit e25a6aa8a1
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
View File

@ -35,6 +35,8 @@ public class IdGenerator {
private String seed; private String seed;
private final AtomicLong sequence = new AtomicLong(1); private final AtomicLong sequence = new AtomicLong(1);
private int length; private int length;
public static final String PROPERTY_IDGENERATOR_HOSTNAME ="activemq.idgenerator.hostname";
public static final String PROPERTY_IDGENERATOR_LOCALPORT ="activemq.idgenerator.localport";
public static final String PROPERTY_IDGENERATOR_PORT ="activemq.idgenerator.port"; public static final String PROPERTY_IDGENERATOR_PORT ="activemq.idgenerator.port";
static { static {
@ -50,15 +52,26 @@ public class IdGenerator {
} }
if (canAccessSystemProps) { if (canAccessSystemProps) {
hostName = System.getProperty(PROPERTY_IDGENERATOR_HOSTNAME);
int localPort = Integer.parseInt(System.getProperty(PROPERTY_IDGENERATOR_LOCALPORT, "0"));
int idGeneratorPort = 0; int idGeneratorPort = 0;
ServerSocket ss = null; ServerSocket ss = null;
try { try {
idGeneratorPort = Integer.parseInt(System.getProperty(PROPERTY_IDGENERATOR_PORT, "0")); if( hostName!=null ) {
LOG.trace("Using port {}", idGeneratorPort); hostName = InetAddressUtil.getLocalHostName();
hostName = InetAddressUtil.getLocalHostName(); }
ss = new ServerSocket(idGeneratorPort); if( localPort==0 ) {
stub = "-" + ss.getLocalPort() + "-" + System.currentTimeMillis() + "-"; idGeneratorPort = Integer.parseInt(System.getProperty(PROPERTY_IDGENERATOR_PORT, "0"));
Thread.sleep(100); LOG.trace("Using port {}", idGeneratorPort);
ss = new ServerSocket(idGeneratorPort);
localPort = ss.getLocalPort();
stub = "-" + localPort + "-" + System.currentTimeMillis() + "-";
Thread.sleep(100);
} else {
stub = "-" + localPort + "-" + System.currentTimeMillis() + "-";
}
} catch (Exception e) { } catch (Exception e) {
if (LOG.isTraceEnabled()) { if (LOG.isTraceEnabled()) {
LOG.trace("could not generate unique stub by using DNS and binding to local port", e); LOG.trace("could not generate unique stub by using DNS and binding to local port", e);