From 86f281f57be539ad64238630f21de64726b93b90 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Tue, 25 May 2021 14:31:28 +0200 Subject: MInor cleanup, no functional changes --- .../src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java | 4 ++-- .../main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'zookeeper-server/zookeeper-server-3.6.3') diff --git a/zookeeper-server/zookeeper-server-3.6.3/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java b/zookeeper-server/zookeeper-server-3.6.3/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java index 113669b2e76..c4062c64dd4 100644 --- a/zookeeper-server/zookeeper-server-3.6.3/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java +++ b/zookeeper-server/zookeeper-server-3.6.3/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java @@ -30,7 +30,7 @@ class VespaQuorumPeer extends QuorumPeerMain implements QuorumPeer { @Override public void shutdown(Duration timeout) { if (quorumPeer != null) { - log.log(Level.INFO, "Shutting down ZooKeeper server"); + log.log(Level.FINE, "Shutting down ZooKeeper server"); try { quorumPeer.shutdown(); quorumPeer.join(timeout.toMillis()); // Wait for shutdown to complete @@ -43,7 +43,7 @@ class VespaQuorumPeer extends QuorumPeerMain implements QuorumPeer { // server with the new config, this will fail until the old server is deconstructed. If the old server // fails to deconstruct/shut down, the new one will never start and if that happens forcing a restart is // the better option. - Process.logAndDie("Failed to shut down ZooKeeper properly, forcing shutdown", e); + Process.logAndDie("Failed to shut down ZooKeeper server properly, forcing shutdown", e); } } } diff --git a/zookeeper-server/zookeeper-server-3.6.3/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java b/zookeeper-server/zookeeper-server-3.6.3/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java index d92527fb5fd..b41b80d6f93 100644 --- a/zookeeper-server/zookeeper-server-3.6.3/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java +++ b/zookeeper-server/zookeeper-server-3.6.3/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java @@ -38,8 +38,7 @@ public class VespaZooKeeperAdminImpl implements VespaZooKeeperAdmin { if (zooKeeperAdmin != null) { try { zooKeeperAdmin.close(); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { /* ignore */} } } } -- cgit v1.2.3