diff options
author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2021-03-18 13:11:17 +0100 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2021-03-18 13:11:17 +0100 |
commit | 5b135fb388bd6e5c98b10383cc79692d370646da (patch) | |
tree | 2173ac87bbfc15fa10c6c6192372601e54573f94 /clustercontroller-core | |
parent | c3c4996cb992820bd3543b9355ec1a23bcb5ef71 (diff) |
Guard against Slobrok mirror not yet being configured
Diffstat (limited to 'clustercontroller-core')
2 files changed, 2 insertions, 6 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java index a3ef158c3f4..654a2aaae7f 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java @@ -243,7 +243,7 @@ public class DatabaseHandler { didWork = true; } } - if (isDatabaseClosedSafe() && zooKeeperIsConfigured() && connectionEstablishmentIsAllowed()) { + if (isDatabaseClosedSafe() && zooKeeperIsConfigured() && connectionEstablishmentIsAllowed) { long currentTime = timer.getCurrentTimeInMillis(); if (currentTime - lastZooKeeperConnectionAttempt < minimumWaitBetweenFailedConnectionAttempts) { return false; // Not time to attempt connection yet. @@ -268,10 +268,6 @@ public class DatabaseHandler { return didWork; } - private boolean connectionEstablishmentIsAllowed() { - return connectionEstablishmentIsAllowed; - } - public void setConnectionEstablishmentIsAllowed(boolean allowed) { connectionEstablishmentIsAllowed = allowed; } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java index cb3568ca853..8649e7cc11a 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java @@ -70,7 +70,7 @@ public class SlobrokClient implements NodeLookup { @Override public boolean isReady() { - return mirror.ready(); + return mirror != null && mirror.ready(); } @Override |