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.

Sign up for GitHub

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

Jump to bottom

Replaced the synchronized use of System.getProperties with AtomicInteger in pool name generation #2115

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Replaced the synchronized use of System.getProperties with AtomicInteger in pool name generation #2115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 6 additions & 23 deletions src/main/java/com/zaxxer/hikari/HikariConfig.java
View file
Open in desktop
Expand Up @@ -29,13 +29,12 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.lang.reflect.Modifier;
import java.security.AccessControlException;
import java.sql.Connection;
import java.util.Properties;
import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicInteger;

import static com.zaxxer.hikari.util.UtilityElf.getNullIfEmpty;
import static com.zaxxer.hikari.util.UtilityElf.safeIsAssignableFrom;
Expand All @@ -55,6 +54,7 @@ public class HikariConfig implements HikariConfigMXBean
private static final long MAX_LIFETIME = MINUTES.toMillis(30);
private static final long DEFAULT_KEEPALIVE_TIME = 0L;
private static final int DEFAULT_POOL_SIZE = 10;
private static final AtomicInteger POOL_NUMBER = new AtomicInteger(0);

private static boolean unitTest = false;

Expand Down Expand Up @@ -1164,27 +1164,10 @@ private void loadProperties(String propertyFileName)
private String generatePoolName()
{
final var prefix = "HikariPool-";
try {
// Pool number is global to the VM to avoid overlapping pool numbers in classloader scoped environments
synchronized (System.getProperties()) {
final var next = String.valueOf(Integer.getInteger("com.zaxxer.hikari.pool_number", 0) + 1);
System.setProperty("com.zaxxer.hikari.pool_number", next);
return prefix + next;
}
} catch (AccessControlException e) {
// The SecurityManager didn't allow us to read/write system properties
// so just generate a random pool number instead
final var random = ThreadLocalRandom.current();
final var buf = new StringBuilder(prefix);

for (var i = 0; i < 4; i++) {
buf.append(ID_CHARACTERS[random.nextInt(62)]);
}

LOGGER.info("assigned random pool name '{}' (security manager prevented access to system properties)", buf);

return buf.toString();
}
// Pool number is global to the VM to avoid overlapping pool numbers in classloader scoped environments
// The pool number will be incremented atomically
final var next = String.valueOf(POOL_NUMBER.incrementAndGet());
return prefix + next;
}

private Object getObjectOrPerformJndiLookup(Object object)
Expand Down