diff options
5 files changed, 3 insertions, 20 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java index f36f7088424..baa98790d28 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java @@ -5,7 +5,6 @@ import com.google.common.util.concurrent.UncheckedTimeoutException; import com.google.inject.Inject; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.log.LogLevel; import com.yahoo.vespa.applicationmodel.ApplicationInstance; import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; import com.yahoo.vespa.applicationmodel.ClusterId; @@ -398,8 +397,6 @@ public class OrchestratorImpl implements Orchestrator { .collect(Collectors.toSet()); // For all content clusters set in maintenance - log.log(LogLevel.INFO, String.format("Setting content clusters %s for application %s to %s", - contentClusterIds,application.applicationInstanceId(),state)); for (ClusterId clusterId : contentClusterIds) { List<HostName> clusterControllers = VespaModelUtil.getClusterControllerInstancesInOrder(application, clusterId); ClusterControllerClient client = clusterControllerClientFactory.createClient( diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/StorageNodeImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/StorageNodeImpl.java index 0e4fe672725..9900c8de752 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/StorageNodeImpl.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/StorageNodeImpl.java @@ -104,12 +104,6 @@ public class StorageNodeImpl implements StorageNode { HostedVespaPolicy.SET_NODE_STATE_CONSTRAINT, "Failed to set state to " + wantedNodeState + " in cluster controller: " + response.reason); } - - String logSuffix = context.isProbe() ? - " would have been set to " + wantedNodeState + " (this is a probe)" : - " has been set to " + wantedNodeState; - logger.log(LogLevel.INFO, "Storage node " + nodeIndex + " in cluster " + clusterId + - " application " + applicationInstance.reference().asString() + " on host " + hostName() + logSuffix); } @Override diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkApplicationLock.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkApplicationLock.java index 479dc5062a8..dfaaecbcf82 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkApplicationLock.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkApplicationLock.java @@ -58,7 +58,6 @@ class ZkApplicationLock implements ApplicationLock { @Override public void setHostState(final HostName hostName, final HostStatus status) { if (probe) return; - log.log(LogLevel.INFO, "Setting host " + hostName + " to status " + status); hostInfosCache.setHostStatus(reference, hostName, status); } @@ -66,8 +65,6 @@ class ZkApplicationLock implements ApplicationLock { public void setApplicationInstanceStatus(ApplicationInstanceStatus applicationInstanceStatus) { if (probe) return; - log.log(LogLevel.INFO, "Setting app " + reference.asString() + " to status " + applicationInstanceStatus); - String path = statusService.applicationInstanceSuspendedPath(reference); switch (applicationInstanceStatus) { case NO_REMARKS: diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java index fab58aaf638..246a70992c7 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java @@ -12,8 +12,6 @@ import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.curator.Lock; -import com.yahoo.vespa.flags.FlagSource; -import com.yahoo.vespa.flags.Flags; import com.yahoo.vespa.orchestrator.OrchestratorContext; import com.yahoo.vespa.orchestrator.OrchestratorUtil; import com.yahoo.vespa.service.monitor.AntiServiceMonitor; @@ -242,7 +240,6 @@ public class ZkStatusService implements StatusService { Set<HostName> toRemove = new HashSet<>(hostInfos.getZkHostnames()); toRemove.removeAll(hostnames); if (toRemove.size() > 0) { - log.log(LogLevel.INFO, "Removing " + toRemove + " of " + reference + " from status service"); hostInfosCache.removeHosts(reference, toRemove); } }); @@ -260,8 +257,6 @@ public class ZkStatusService implements StatusService { @Override public void onApplicationRemove(ApplicationInstanceReference reference) { withLockForAdminOp(reference, " was removed", () -> { - log.log(LogLevel.INFO, "Removing application " + reference + " from status service"); - // /vespa/application-status-service/REFERENCE curator.delete(Path.fromString(applicationInstanceSuspendedPath(reference))); diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java index 75a309ab202..104f41c39ed 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java @@ -42,7 +42,7 @@ public class DuperModel { void setComplete() { if (!isComplete) { - logger.log(LogLevel.INFO, "All applications have been activated: duper model is complete"); + logger.log(LogLevel.DEBUG, "All applications have been activated: duper model is complete"); isComplete = true; listeners.forEach(DuperModelListener::bootstrapComplete); @@ -95,7 +95,7 @@ public class DuperModel { } else { logPrefix = isComplete ? "Reactivated application " : "Rebootstrapped application "; } - logger.log(LogLevel.INFO, logPrefix + id.toFullString()); + logger.log(LogLevel.DEBUG, logPrefix + id.toFullString()); updateHostnameVsIdMaps(applicationInfo, id); @@ -110,7 +110,7 @@ public class DuperModel { ApplicationInfo application = applicationsById.remove(applicationId); if (application != null) { - logger.log(LogLevel.INFO, "Removed application " + applicationId.toFullString()); + logger.log(LogLevel.DEBUG, "Removed application " + applicationId.toFullString()); listeners.forEach(listener -> listener.applicationRemoved(applicationId)); } } |