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.

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

Added parameter initalizationMaxAttempts which controls number of att… #771

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/main/java/com/zaxxer/hikari/HikariConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public class HikariConfig implements HikariConfigMXBean
private boolean isAutoCommit;
private boolean isReadOnly;
private boolean isInitializationFailFast;
private long initializationMaxAttempts;
private boolean isIsolateInternalQueries;
private boolean isRegisterMbeans;
private boolean isAllowPoolSuspension;
Expand Down Expand Up @@ -112,6 +113,7 @@ public HikariConfig()

isAutoCommit = true;
isInitializationFailFast = true;
initializationMaxAttempts = 1;

String systemProp = System.getProperty("hikaricp.configurationFile");
if (systemProp != null) {
Expand Down Expand Up @@ -415,6 +417,24 @@ public void setInitializationFailFast(boolean failFast)
isInitializationFailFast = failFast;
}

/**
* Get maximum number of connection attemts, that will be performed during startup.
*
* @return Number of attempts to get initail connection.
*/
public long getInitializationMaxAttempts() {
return initializationMaxAttempts;
}

/**
* Set maximum number of connection attempts, that will be performed during startup.
*
* @param initializationMaxAttempts Maximum number of connection attempts during startup.
*/
public void setInitializationMaxAttempts(long initializationMaxAttempts) {
this.initializationMaxAttempts = initializationMaxAttempts;
}

public boolean isIsolateInternalQueries()
{
return isIsolateInternalQueries;
Expand Down
31 changes: 25 additions & 6 deletions src/main/java/com/zaxxer/hikari/pool/HikariPool.java
Original file line number Diff line number Diff line change
Expand Up @@ -508,13 +508,22 @@ private void abortActiveConnections(final ExecutorService assassinExecutor)
private void checkFailFast()
{
if (config.isInitializationFailFast()) {
try (Connection connection = newConnection()) {
if (!connection.getAutoCommit()) {
connection.commit();
for (int i = 0; i < config.getInitializationMaxAttempts(); i++) {
try (Connection connection = newConnection()) {
if (!connection.getAutoCommit()) {
connection.commit();
}
return;
}
catch (Throwable e) {
if (i == config.getInitializationMaxAttempts() - 1) {
throw new PoolInitializationException(e);
}
else {
LOGGER.error("Error connecting during startup. Attempt #" + i);
quietlySleep(100L);
}
}
}
catch (Throwable e) {
throw new PoolInitializationException(e);
}
}
}
Expand Down Expand Up @@ -665,5 +674,15 @@ public PoolInitializationException(Throwable t)
{
super("Failed to initialize pool: " + t.getMessage(), t);
}

/**
* Construct an exception, with a message.
*
* @param message Exceptiion message
*/
public PoolInitializationException(String message)
{
super(message);
}
}
}