diff options
25 files changed, 52 insertions, 52 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java index e0f3b294c4d..4af4b2b15a1 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java @@ -57,9 +57,9 @@ public class EventLog implements EventLogInterface { } if (e instanceof NodeEvent) { - addNodeOnlyEvent((NodeEvent)e, logInfo ? LogLevel.INFO: LogLevel.DEBUG); + addNodeOnlyEvent((NodeEvent)e, logInfo ? LogLevel.INFO: Level.FINE); } else { - log.log(logInfo ? LogLevel.INFO : LogLevel.DEBUG, e.toString()); + log.log(logInfo ? LogLevel.INFO : Level.FINE, e.toString()); } } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java index 6bd6ab3c834..abdb6255ca2 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java @@ -118,7 +118,7 @@ public class StateChangeHandler { final NodeStateOrHostInfoChangeHandler nodeListener) { final NodeState currentState = currentClusterState.getNodeState(node.getNode()); - final LogLevel level = (currentState.equals(reportedState) && node.getVersion() == 0) ? LogLevel.SPAM : LogLevel.DEBUG; + final LogLevel level = (currentState.equals(reportedState) && node.getVersion() == 0) ? Level.FINEST : Level.FINE; if (log.isLoggable(level)) { log.log(level, String.format("Got nodestate reply from %s: %s (Current state is %s)", node, node.getReportedState().getTextualDifference(reportedState), currentState.toString(true))); @@ -134,7 +134,7 @@ public class StateChangeHandler { if (reportedState.getState().equals(State.DOWN)) { eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(node, "Failed to get node state: " + reportedState.toString(true), NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO); } else { - eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(node, "Now reporting state " + reportedState.toString(true), NodeEvent.Type.REPORTED, currentTime), LogLevel.DEBUG); + eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(node, "Now reporting state " + reportedState.toString(true), NodeEvent.Type.REPORTED, currentTime), Level.FINE); } } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java index 645ad694a0c..95e03d1f6f1 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java @@ -66,7 +66,7 @@ public class SystemStateBroadcaster { long time = timer.getCurrentTimeInMillis(); Long lastReported = lastErrorReported.get(info.getNode()); boolean alreadySeen = (lastReported != null && time - lastReported < minTimeBetweenNodeErrorLogging); - log.log((nodeOk && !alreadySeen) ? LogLevel.WARNING : LogLevel.DEBUG, message); + log.log((nodeOk && !alreadySeen) ? LogLevel.WARNING : Level.FINE, message); if (!alreadySeen) { lastErrorReported.put(info.getNode(), time); } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java index 55241d8310d..3028ffe6e2c 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java @@ -146,7 +146,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface { } catch (SocketTimeoutException e) { // Ignore, since timeout is set to 100 ms } catch (java.io.IOException e) { - log.log(shouldBeConnected ? LogLevel.WARNING : LogLevel.DEBUG, "Caught IO exception in ServerSocket.accept(): " + e.getMessage()); + log.log(shouldBeConnected ? LogLevel.WARNING : Level.FINE, "Caught IO exception in ServerSocket.accept(): " + e.getMessage()); } if (connection == null) continue; log.log(Level.FINE, "Got a status page request."); @@ -235,7 +235,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface { output.write(header.toString().getBytes()); output.write(response.getOutputStream().toByteArray()); } catch (java.io.IOException e) { - log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? LogLevel.DEBUG : LogLevel.INFO, + log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? Level.FINE : LogLevel.INFO, "Failed to process HTTP request : " + e.getMessage()); } catch (Exception e) { log.log(Level.WARNING, "Caught exception in HTTP server thread: " @@ -244,7 +244,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface { if (output != null) try { output.close(); } catch (IOException e) { - log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? LogLevel.DEBUG : LogLevel.INFO, + log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? Level.FINE : LogLevel.INFO, "Failed to close output stream on socket " + connection + ": " + e.getMessage()); } if (connection != null) try{ diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateGatherTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateGatherTest.java index 695e2954546..7e2d8d09e1b 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateGatherTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateGatherTest.java @@ -25,7 +25,7 @@ public class StateGatherTest extends FleetControllerTest { @Test public void testAlwaysHavePendingGetNodeStateRequestTowardsNodes() throws Exception { - Logger.getLogger(NodeStateGatherer.class.getName()).setLevel(LogLevel.SPAM); + Logger.getLogger(NodeStateGatherer.class.getName()).setLevel(Level.FINEST); startingTest("StateGatherTest::testOverlappingGetNodeStateRequests"); FleetControllerOptions options = defaultOptions("mycluster"); options.nodeStateRequestTimeoutMS = 10 * 60 * 1000; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java index fc7b3a96d53..953f1000236 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java @@ -103,7 +103,7 @@ public class RestApiHandler implements HttpRequestHandler { return new JsonHttpResult().setJson(jsonWriter.createJson(setResponse)); } } catch (OtherMasterException exception) { - logRequestException(request, exception, LogLevel.DEBUG); + logRequestException(request, exception, Level.FINE); JsonHttpResult result = new JsonHttpResult(); result.setHttpCode(307, "Temporary Redirect"); result.addHeader("Location", getMasterLocationUrl(request, exception.getHost(), exception.getPort())); @@ -130,7 +130,7 @@ public class RestApiHandler implements HttpRequestHandler { result.setJson(jsonWriter.createErrorJson(exception.getMessage())); return result; } catch (Exception exception) { - logRequestException(request, exception, LogLevel.ERROR); + logRequestException(request, exception, Level.SEVERE); JsonHttpResult result = new JsonHttpResult(); result.setHttpCode(500, "Failed to process request"); result.setJson(jsonWriter.createErrorJson(exception.getClass().getName() + ": " + exception.getMessage())); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java index 58edc3a9afe..f45e2cf6285 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java @@ -34,8 +34,8 @@ public class DeployHandlerLogger implements DeployLogger { @Override public void log(Level level, String message) { if ((level == LogLevel.FINE || - level == LogLevel.DEBUG || - level == LogLevel.SPAM) && + level == Level.FINE || + level == Level.FINEST) && !verbose) { return; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java index 8c46ec32adb..cf6890e22d2 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java @@ -49,7 +49,7 @@ class GetConfigProcessor implements Runnable { private void respond(JRTServerConfigRequest request) { Request req = request.getRequest(); if (req.isError()) { - Level logLevel = (req.errorCode() == ErrorCode.APPLICATION_NOT_LOADED) ? LogLevel.DEBUG : LogLevel.INFO; + Level logLevel = (req.errorCode() == ErrorCode.APPLICATION_NOT_LOADED) ? Level.FINE : LogLevel.INFO; log.log(logLevel, logPre + req.errorMessage()); } rpcServer.respond(request); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java index 3bc67e59fd9..8082b340970 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java @@ -274,7 +274,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener { // there is no need for any extra check. if (delayedConfigResponse.cancel()) { if (log.isLoggable(Level.FINE)) { - logRequestDebug(LogLevel.DEBUG, logPre + "Timer cancelled for ", delayedConfigResponse.request); + logRequestDebug(Level.FINE, logPre + "Timer cancelled for ", delayedConfigResponse.request); } // Do not wait for this request if we were unable to execute if (addToRequestQueue(delayedConfigResponse.request, false, completionService)) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java index 268a755b266..eb5770972ff 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java @@ -37,7 +37,7 @@ public class LocalSessionStateWatcher { // Will delete session if it exists in local session repo private void sessionChanged(Session.Status status) { long sessionId = session.getSessionId(); - log.log(status == Session.Status.DELETE ? LogLevel.INFO : LogLevel.DEBUG, + log.log(status == Session.Status.DELETE ? LogLevel.INFO : Level.FINE, session.logPre() + "Session change: Local session " + sessionId + " changed status to " + status); if (status.equals(Session.Status.DELETE) && localSessionRepo.getSession(sessionId) != null) { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java b/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java index dde4e8b73e4..9c48955bf4c 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java @@ -159,9 +159,9 @@ public class ContentChannelOutputStream extends OutputStream implements Writable Level logLevel; synchronized (failLock) { if (failed) { - logLevel = LogLevel.SPAM; + logLevel = Level.FINEST; } else { - logLevel = LogLevel.DEBUG; + logLevel = Level.FINE; } failed = true; } diff --git a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java index cedd5b97ed6..6c5ac7718d5 100644 --- a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java +++ b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java @@ -529,7 +529,7 @@ public abstract class AsynchronousSectionedRenderer<RESPONSE extends Response> e } catch (Exception e) { Level level = LogLevel.WARNING; if ((e instanceof IOException)) { - level = LogLevel.DEBUG; + level = Level.FINE; if ( ! clientClosed) { clientClosed = true; onClientClosed(); diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingTestCase.java b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingTestCase.java index dce791d375f..876fd0d2b57 100644 --- a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingTestCase.java +++ b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingTestCase.java @@ -102,8 +102,8 @@ public class LoggingTestCase { stream.send(createData()); stream.flush(); assertNull(logChecker.errorCounter.get(LogLevel.INFO)); - assertEquals(1, logChecker.errorCounter.get(LogLevel.DEBUG).intValue()); - assertEquals(2, logChecker.errorCounter.get(LogLevel.SPAM).intValue()); + assertEquals(1, logChecker.errorCounter.get(Level.FINE).intValue()); + assertEquals(2, logChecker.errorCounter.get(Level.FINEST).intValue()); } } diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java index 9ac1cb33d1b..56b5a826cba 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java @@ -300,9 +300,9 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher { String expUserId = query.properties().getString(streamingUserid); String expGroupName = query.properties().getString(streamingGroupname); - LogLevel logLevel = LogLevel.ERROR; + LogLevel logLevel = Level.SEVERE; if (skippedEarlierResult) { - logLevel = LogLevel.DEBUG; + logLevel = Level.FINE; } DocumentId docId; diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java index b0170486eca..c16e72e3ad1 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java @@ -105,7 +105,7 @@ public class LogEntry { public static Type typeOf(Level level) { return level.intValue() < LogLevel.INFO.intValue() ? Type.debug : level.intValue() < LogLevel.WARNING.intValue() ? Type.info - : level.intValue() < LogLevel.ERROR.intValue() ? Type.warning + : level.intValue() < Level.SEVERE.intValue() ? Type.warning : Type.error; } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java index 926f5a352cb..0dccea41ae1 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java @@ -85,9 +85,9 @@ public class DeploymentTester { outstandingChangeDeployer = new OutstandingChangeDeployer(tester.controller(), maintenanceInterval, jobControl); // Get deployment job logs to stderr. - Logger.getLogger("").setLevel(LogLevel.DEBUG); - Logger.getLogger(InternalStepRunner.class.getName()).setLevel(LogLevel.DEBUG); - tester.configureDefaultLogHandler(handler -> handler.setLevel(LogLevel.DEBUG)); + Logger.getLogger("").setLevel(Level.FINE); + Logger.getLogger(InternalStepRunner.class.getName()).setLevel(Level.FINE); + tester.configureDefaultLogHandler(handler -> handler.setLevel(Level.FINE)); // Mock Athenz domain to allow launch of service AthenzDbMock.Domain domain = tester.athenzDb().getOrCreateDomain(new com.yahoo.vespa.athenz.api.AthenzDomain(ATHENZ_DOMAIN)); diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java index 11dd5195ee0..78afcd72056 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java @@ -117,7 +117,7 @@ public class FileReferenceDownloader { request.parameters().add(new Int32Value(fileReferenceDownload.downloadFromOtherSourceIfNotFound() ? 0 : 1)); connection.invokeSync(request, (double) rpcTimeout.getSeconds()); - Level logLevel = (retryCount > 0 ? LogLevel.INFO : LogLevel.DEBUG); + Level logLevel = (retryCount > 0 ? LogLevel.INFO : Level.FINE); if (validateResponse(request)) { log.log(logLevel, () -> "Request callback, OK. Req: " + request + "\nSpec: " + connection + ", retry count " + retryCount); if (request.returnValues().get(0).asInt32() == 0) { diff --git a/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java b/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java index 6e2a074cf8f..3f040821a7f 100644 --- a/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java +++ b/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java @@ -82,9 +82,9 @@ class ProtobufSerialization { private static Level fromLogMessageLevel(LogProtocol.LogMessage.Level level) { switch (level) { case FATAL: - return LogLevel.FATAL; + return Level.SEVERE; case ERROR: - return LogLevel.ERROR; + return Level.SEVERE; case WARNING: return LogLevel.WARNING; case CONFIG: @@ -94,9 +94,9 @@ class ProtobufSerialization { case EVENT: return LogLevel.EVENT; case DEBUG: - return LogLevel.DEBUG; + return Level.FINE; case SPAM: - return LogLevel.SPAM; + return Level.FINEST; case UNKNOWN: case UNRECOGNIZED: default: @@ -106,9 +106,9 @@ class ProtobufSerialization { private static LogProtocol.LogMessage.Level toLogMessageLevel(Level level) { Level vespaLevel = LogLevel.getVespaLogLevel(level); - if (vespaLevel.equals(LogLevel.FATAL)) { + if (vespaLevel.equals(Level.SEVERE)) { return LogProtocol.LogMessage.Level.FATAL; - } else if (vespaLevel.equals(LogLevel.ERROR)) { + } else if (vespaLevel.equals(Level.SEVERE)) { return LogProtocol.LogMessage.Level.ERROR; } else if (vespaLevel.equals(LogLevel.WARNING)) { return LogProtocol.LogMessage.Level.WARNING; @@ -118,9 +118,9 @@ class ProtobufSerialization { return LogProtocol.LogMessage.Level.INFO; } else if (vespaLevel.equals(LogLevel.EVENT)) { return LogProtocol.LogMessage.Level.EVENT; - } else if (vespaLevel.equals(LogLevel.DEBUG)) { + } else if (vespaLevel.equals(Level.FINE)) { return LogProtocol.LogMessage.Level.DEBUG; - } else if (vespaLevel.equals(LogLevel.SPAM)) { + } else if (vespaLevel.equals(Level.FINEST)) { return LogProtocol.LogMessage.Level.SPAM; } else { return LogProtocol.LogMessage.Level.UNKNOWN; diff --git a/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java index 6549e06834d..fa9dbd0460e 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java @@ -68,7 +68,7 @@ public class SendProxyTestCase { sendMessage(0, null); assertNull(logHandler.trace); - log.setLevel(LogLevel.DEBUG); + log.setLevel(Level.FINE); sendMessage(0, null); assertNull(logHandler.trace); @@ -90,7 +90,7 @@ public class SendProxyTestCase { "</trace>\n", logHandler.trace); logHandler.trace = null; - log.setLevel(LogLevel.SPAM); + log.setLevel(Level.FINEST); sendMessage(1, null); assertNull(logHandler.trace); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java index c0b4ecb1a36..0b5ddc6a943 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java @@ -99,11 +99,11 @@ public class AclMaintainer { dockerOperations.executeCommandInNetworkNamespace(context, ipVersion.iptablesRestore(), fileHandler.absolutePath()); } catch (Exception e) { if (flush) { - context.log(logger, LogLevel.ERROR, "Exception occurred while syncing iptable " + table + ", attempting rollback", e); + context.log(logger, Level.SEVERE, "Exception occurred while syncing iptable " + table + ", attempting rollback", e); try { dockerOperations.executeCommandInNetworkNamespace(context, ipVersion.iptablesCmd(), "-F", "-t", table); } catch (Exception ne) { - context.log(logger, LogLevel.ERROR, "Rollback of table " + table + " failed, giving up", ne); + context.log(logger, Level.SEVERE, "Rollback of table " + table + " failed, giving up", ne); } } else { context.log(logger, LogLevel.WARNING, "Unable to sync iptables for " + table, e); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java index 3cb74aef5a7..860cc8468e6 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java @@ -109,7 +109,7 @@ public class AthenzCredentialsMaintainer implements CredentialsMaintainer { public boolean converge(NodeAgentContext context) { try { - context.log(logger, LogLevel.DEBUG, "Checking certificate"); + context.log(logger, Level.FINE, "Checking certificate"); Path containerSiaDirectory = context.pathOnHostFromPathInNode(CONTAINER_SIA_DIRECTORY); Path privateKeyFile = SiaUtils.getPrivateKeyFile(containerSiaDirectory, context.identity()); Path certificateFile = SiaUtils.getCertificateFile(containerSiaDirectory, context.identity()); @@ -146,7 +146,7 @@ public class AthenzCredentialsMaintainer implements CredentialsMaintainer { return true; } } - context.log(logger, LogLevel.DEBUG, "Certificate is still valid"); + context.log(logger, Level.FINE, "Certificate is still valid"); return false; } catch (IOException e) { throw new UncheckedIOException(e); @@ -169,7 +169,7 @@ public class AthenzCredentialsMaintainer implements CredentialsMaintainer { Instant expiry = certificate.getNotAfter().toInstant(); return Duration.between(now, expiry); } catch (IOException e) { - context.log(logger, LogLevel.ERROR, "Unable to read certificate at " + certificateFile, e); + context.log(logger, Level.SEVERE, "Unable to read certificate at " + certificateFile, e); return Duration.ZERO; } } @@ -236,14 +236,14 @@ public class AthenzCredentialsMaintainer implements CredentialsMaintainer { context.log(logger, "Instance successfully refreshed and credentials written to file"); } catch (ZtsClientException e) { if (e.getErrorCode() == 403 && e.getDescription().startsWith("Certificate revoked")) { - context.log(logger, LogLevel.ERROR, "Certificate cannot be refreshed as it is revoked by ZTS - re-registering the instance now", e); + context.log(logger, Level.SEVERE, "Certificate cannot be refreshed as it is revoked by ZTS - re-registering the instance now", e); registerIdentity(context, privateKeyFile, certificateFile, identityDocumentFile); } else { throw e; } } } catch (Exception e) { - context.log(logger, LogLevel.ERROR, "Certificate refresh failed: " + e.getMessage(), e); + context.log(logger, Level.SEVERE, "Certificate refresh failed: " + e.getMessage(), e); } } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index d473b3dcf40..bc532a84b64 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -164,7 +164,7 @@ public class NodeAgentImpl implements NodeAgent { void resumeNodeIfNeeded(NodeAgentContext context) { if (!hasResumedNode) { - context.log(logger, LogLevel.DEBUG, "Starting optional node program resume command"); + context.log(logger, Level.FINE, "Starting optional node program resume command"); dockerOperations.resumeNode(context); hasResumedNode = true; } @@ -404,10 +404,10 @@ public class NodeAgentImpl implements NodeAgent { context.log(logger, LogLevel.WARNING, "Container unexpectedly gone, resetting containerState to " + containerState); } catch (DockerException e) { numberOfUnhandledException++; - context.log(logger, LogLevel.ERROR, "Caught a DockerException", e); + context.log(logger, Level.SEVERE, "Caught a DockerException", e); } catch (Throwable e) { numberOfUnhandledException++; - context.log(logger, LogLevel.ERROR, "Unhandled exception, ignoring", e); + context.log(logger, Level.SEVERE, "Unhandled exception, ignoring", e); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java index d2e214d9199..a3340e4cedb 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java @@ -80,7 +80,7 @@ public class NodeRepositoryProvisioner implements Provisioner { @Override public List<HostSpec> prepare(ApplicationId application, ClusterSpec cluster, Capacity requested, ProvisionLogger logger) { - log.log(zone.system().isCd() ? Level.INFO : LogLevel.DEBUG, + log.log(zone.system().isCd() ? Level.INFO : Level.FINE, () -> "Received deploy prepare request for " + requested + " for application " + application + ", cluster " + cluster); diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java index d1e85adb503..666dfd47b47 100644 --- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java +++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java @@ -121,7 +121,7 @@ public class TestRunnerHandler extends LoggingRequestHandler { return level.getName().equals("html") ? "html" : level.intValue() < LogLevel.INFO.intValue() ? "debug" : level.intValue() < LogLevel.WARNING.intValue() ? "info" - : level.intValue() < LogLevel.ERROR.intValue() ? "warning" + : level.intValue() < Level.SEVERE.intValue() ? "warning" : "error"; } diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java index eccafc92c34..2c06c4a296a 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java @@ -246,7 +246,7 @@ class ClientFeederV3 { if (result.isAccepted()) { outstandingOperations.incrementAndGet(); updateOpsPerSec(); - log(LogLevel.DEBUG, "Sent message successfully, document id: ", msg.get().getOperationId()); + log(Level.FINE, "Sent message successfully, document id: ", msg.get().getOperationId()); } else if (!result.getError().isFatal()) { repliesFromOldMessages.add(createOperationStatus(msg.get().getOperationId(), result.getError().getMessage(), @@ -297,7 +297,7 @@ class ClientFeederV3 { return null; } metric.add(MetricNames.NUM_OPERATIONS, 1, null /*metricContext*/); - log(LogLevel.DEBUG, "Successfully deserialized document id: ", message.getOperationId()); + log(Level.FINE, "Successfully deserialized document id: ", message.getOperationId()); return message; } |