summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon@verizonmedia.com>2020-07-30 15:52:21 +0200
committerGitHub <noreply@github.com>2020-07-30 15:52:21 +0200
commitbbd0bdefd1da3564866560382704b165620e8197 (patch)
treea0b72d92793a2e8059c3c359fdf8878139c1e3f7
parente9690225586f804258eb727ffd91023ffebeb7b6 (diff)
parent3504bc79345dd2c708642eb4cfe3ad64ef97f2e8 (diff)
Merge pull request #13954 from vespa-engine/hmusum/increase-zkmetricupdater-timeouts
Double timeouts
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java
index 52ca73c68b9..401588f478c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java
@@ -36,11 +36,11 @@ public class ZKMetricUpdater implements Runnable {
public static final String METRIC_ZK_CONNECTIONS = getMetricName("zkConnections");
public static final String METRIC_ZK_OUTSTANDING_REQUESTS = getMetricName("zkOutstandingRequests");
- private static final int CONNECTION_TIMEOUT_MS = 500;
- private static final int WRITE_TIMEOUT_MS = 250;
- private static final int READ_TIMEOUT_MS = 500;
+ private static final int CONNECTION_TIMEOUT_MS = 1000;
+ private static final int WRITE_TIMEOUT_MS = 500;
+ private static final int READ_TIMEOUT_MS = 1000;
- private AtomicReference<Map<String, Long>> zkMetrics = new AtomicReference<>(new HashMap<>());
+ private final AtomicReference<Map<String, Long>> zkMetrics = new AtomicReference<>(new HashMap<>());
private final ScheduledExecutorService executorService;
private final int zkPort;
@@ -103,7 +103,7 @@ public class ZKMetricUpdater implements Runnable {
return Optional.of(baos.toString(StandardCharsets.UTF_8));
} catch (IOException | InterruptedException | ExecutionException | TimeoutException e) {
- log.warning("Failure in retrieving monitoring data: (" + e.getClass().getName() + ") " + e.getMessage());
+ log.warning("Failure in retrieving monitoring data: (" + e.getClass().getSimpleName() + ") " + e.getMessage());
return Optional.empty();
}
}