From: Ed Warnicke Date: Sun, 19 Jan 2014 23:33:16 +0000 (-0600) Subject: Fixed inappropriate uses of log level INFO X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~15^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=dad78e1fc8a7c67fa4b88cf09d6a952443462feb Fixed inappropriate uses of log level INFO This is done per the recommendation here: https://wiki.opendaylight.org/view/Draft_Syslog_Level_Settings Change-Id: I69bbe15d81ed49511f643fd4a8c0ad60f58a0c22 Signed-off-by: Ed Warnicke --- diff --git a/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java b/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java index 9ecfb1bb0d..5555fda7d5 100644 --- a/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java +++ b/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java @@ -56,7 +56,7 @@ public abstract class AbstractSessionNegotiator> extends Default } if (!cf.isSuccess()) { - LOG.info("Attempt to connect to connect to {} failed", ProtocolSessionPromise.this.address, cf.cause()); + LOG.warn("Attempt to connect to connect to {} failed", ProtocolSessionPromise.this.address, cf.cause()); final Future rf = ProtocolSessionPromise.this.strategy.scheduleReconnect(cf.cause()); rf.addListener(new FutureListener() { @Override diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigRegistryImpl.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigRegistryImpl.java index 19231705d1..a8406b0029 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigRegistryImpl.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigRegistryImpl.java @@ -182,7 +182,7 @@ public class ConfigRegistryImpl implements AutoCloseable, ConfigRegistryImplMXBe throws ConflictingVersionException, ValidationException { final String transactionName = ObjectNameUtil .getTransactionName(transactionControllerON); - logger.info("About to commit {}. Current parentVersion: {}, versionCounter {}", transactionName, version, versionCounter); + logger.trace("About to commit {}. Current parentVersion: {}, versionCounter {}", transactionName, version, versionCounter); // find ConfigTransactionController Map transactions = transactionsHolder.getCurrentTransactions(); diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java index e0d1a42661..90d2cb4002 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java @@ -306,7 +306,7 @@ class ConfigTransactionControllerImpl implements private void validate_noLocks() throws ValidationException { transactionStatus.checkNotAborted(); - logger.info("Validating transaction {}", getTransactionIdentifier()); + logger.trace("Validating transaction {}", getTransactionIdentifier()); // call validate() List collectedExceptions = new ArrayList<>(); for (Entry entry : dependencyResolverManager @@ -326,7 +326,7 @@ class ConfigTransactionControllerImpl implements throw ValidationException .createFromCollectedValidationExceptions(collectedExceptions); } - logger.info("Validated transaction {}", getTransactionIdentifier()); + logger.trace("Validated transaction {}", getTransactionIdentifier()); } /** @@ -345,7 +345,7 @@ class ConfigTransactionControllerImpl implements try { validate_noLocks(); } catch (ValidationException e) { - logger.info("Commit failed on validation"); + logger.trace("Commit failed on validation"); configBeanModificationDisabled.set(false); // recoverable error throw e; } @@ -368,7 +368,7 @@ class ConfigTransactionControllerImpl implements + "to obtain a lock"); } - logger.info("Committing transaction {}", getTransactionIdentifier()); + logger.trace("Committing transaction {}", getTransactionIdentifier()); // call getInstance() for (Entry entry : dependencyResolverManager @@ -391,7 +391,7 @@ class ConfigTransactionControllerImpl implements // count dependency order - logger.info("Committed configuration {}", getTransactionIdentifier()); + logger.trace("Committed configuration {}", getTransactionIdentifier()); transactionStatus.setCommitted(); // unregister this and all modules from jmx close(); diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java index 682d4a1812..e4652c9bb8 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java @@ -43,7 +43,7 @@ public class DestroyedModule implements AutoCloseable, @Override public void close() { - logger.info("Destroying {}", identifier); + logger.trace("Destroying {}", identifier); try { instance.close(); } catch (Exception e) { diff --git a/opendaylight/config/shutdown-impl/src/main/java/org/opendaylight/controller/config/yang/shutdown/impl/ShutdownServiceImpl.java b/opendaylight/config/shutdown-impl/src/main/java/org/opendaylight/controller/config/yang/shutdown/impl/ShutdownServiceImpl.java index 6cdcf605b0..584ea1766e 100644 --- a/opendaylight/config/shutdown-impl/src/main/java/org/opendaylight/controller/config/yang/shutdown/impl/ShutdownServiceImpl.java +++ b/opendaylight/config/shutdown-impl/src/main/java/org/opendaylight/controller/config/yang/shutdown/impl/ShutdownServiceImpl.java @@ -138,7 +138,7 @@ class CallSystemExitThread extends Thread { logger.warn("Thread dump:{}", sb); System.exit(1); } catch (InterruptedException e) { - logger.info("Interrupted, not going to call System.exit(1)"); + logger.warn("Interrupted, not going to call System.exit(1)"); } } } diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/FtlFilePersister.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/FtlFilePersister.java index f721895921..d6d3893beb 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/FtlFilePersister.java +++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/FtlFilePersister.java @@ -83,12 +83,12 @@ public class FtlFilePersister { pathToFile.mkdirs(); } if (targetFile.exists() && overwrite == false) { - logger.info("Skipping {} since it already exists", targetFile); + logger.trace("Skipping {} since it already exists", targetFile); } else { try (Writer fileWriter = new FileWriter(targetFile)) { fileWriter.write(entry.getValue()); } - logger.info("{}: File {} generated successfully", + logger.trace("{}: File {} generated successfully", JMXGenerator.class.getCanonicalName(), targetFile); result.add(targetFile); } diff --git a/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTracker.java b/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTracker.java index b5efc51d8b..74a36c553f 100644 --- a/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTracker.java +++ b/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTracker.java @@ -136,7 +136,7 @@ public class ExtenderYangTracker extends BundleTracker implements YangSt updateCache(snapshot); cache.setInconsistentURLsForReporting(Collections. emptySet()); - logger.info("Yang store updated to new consistent state containing {} yang files", consistentBundlesToYangURLs.size()); + logger.trace("Yang store updated to new consistent state containing {} yang files", consistentBundlesToYangURLs.size()); logger.debug("Yang store updated to new consistent state containing {}", consistentBundlesToYangURLs); } diff --git a/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationService.java b/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationService.java index ce2aaea562..e6bbcf8eb6 100644 --- a/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationService.java +++ b/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationService.java @@ -99,7 +99,7 @@ public class ConfigurationService implements IConfigurationService, ICacheUpdate Status status = configurationAware.saveConfiguration(); if (!status.isSuccess()) { success = false; - logger.info("Failed to save config for {}", + logger.warn("Failed to save config for {}", configurationAware.getClass().getName()); } } diff --git a/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ContainerConfigurationService.java b/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ContainerConfigurationService.java index d4769016a6..5f1db6b597 100644 --- a/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ContainerConfigurationService.java +++ b/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ContainerConfigurationService.java @@ -96,12 +96,12 @@ public class ContainerConfigurationService implements IConfigurationContainerSer public Status saveConfiguration() { boolean success = true; for (IConfigurationContainerAware configurationAware : configurationAwareList) { - logger.info("Save Config triggered for {}", configurationAware.getClass().getSimpleName()); + logger.trace("Save Config triggered for {}", configurationAware.getClass().getSimpleName()); Status status = configurationAware.saveConfiguration(); if (!status.isSuccess()) { success = false; - logger.info("Failed to save config for {}", configurationAware.getClass().getSimpleName()); + logger.warn("Failed to save config for {}", configurationAware.getClass().getSimpleName()); } } if (success) { diff --git a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java b/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java index d9e941ef78..e096c73780 100644 --- a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java +++ b/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java @@ -896,7 +896,7 @@ public class ContainerManager extends Authorization implements IContaine */ private void notifyContainerModeChange(boolean lastActionDelete, boolean notifyLocal) { if (lastActionDelete == false && containerConfigs.size() == 1) { - logger.info("First container Creation. Inform listeners"); + logger.trace("First container Creation. Inform listeners"); synchronized (this.iContainerListener) { for (IContainerListener i : this.iContainerListener) { i.containerModeUpdated(UpdateType.ADDED); @@ -910,7 +910,7 @@ public class ContainerManager extends Authorization implements IContaine } } } else if (lastActionDelete == true && containerConfigs.isEmpty()) { - logger.info("Last container Deletion. Inform listeners"); + logger.trace("Last container Deletion. Inform listeners"); synchronized (this.iContainerListener) { for (IContainerListener i : this.iContainerListener) { i.containerModeUpdated(UpdateType.REMOVED); diff --git a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java b/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java index e6651b86a1..fe00b774f5 100644 --- a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java +++ b/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java @@ -143,7 +143,7 @@ public class StaticRoutingImplementation implements IfNewHostNotify, IForwarding @SuppressWarnings("deprecation") private void allocateCaches() { if (this.clusterContainerService == null) { - log.info("un-initialized clusterContainerService, can't create cache"); + log.trace("un-initialized clusterContainerService, can't create cache"); return; } @@ -162,7 +162,7 @@ public class StaticRoutingImplementation implements IfNewHostNotify, IForwarding @SuppressWarnings({ "unchecked", "deprecation" }) private void retrieveCaches() { if (this.clusterContainerService == null) { - log.info("un-initialized clusterContainerService, can't retrieve cache"); + log.warn("un-initialized clusterContainerService, can't retrieve cache"); return; } @@ -181,7 +181,7 @@ public class StaticRoutingImplementation implements IfNewHostNotify, IForwarding private void notifyStaticRouteUpdate(StaticRoute s, boolean update) { if (this.staticRoutingAware != null) { - log.info("Invoking StaticRoutingAware listeners"); + log.trace("Invoking StaticRoutingAware listeners"); synchronized (this.staticRoutingAware) { for (IStaticRoutingAware ra : this.staticRoutingAware) { try { diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java index 21b747beee..fc5aac0311 100644 --- a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java +++ b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java @@ -467,7 +467,7 @@ public class ForwardingRulesManager implements Status succeeded = null; boolean decouple = false; if (installedList.size() != toInstallList.size()) { - log.info("Modify: New flow entry does not satisfy the same " + log.trace("Modify: New flow entry does not satisfy the same " + "number of container flows as the original entry does"); decouple = true; } @@ -479,7 +479,7 @@ public class ForwardingRulesManager implements */ FlowEntryInstall sameMatchEntry = installedSwView.get(installEntry); if (sameMatchEntry != null && !sameMatchEntry.getOriginal().equals(currentFlowEntry)) { - log.info("Modify: new container flow merged flow entry clashes with existing flow"); + log.trace("Modify: new container flow merged flow entry clashes with existing flow"); decouple = true; } else { toInstallSafe.add(installEntry); @@ -1263,7 +1263,7 @@ public class ForwardingRulesManager implements } Status error = modifyEntry(currentFlowEntry, newFlowEntry, false); if (error.isSuccess()) { - log.info("Ports {} added to FlowEntry {}", portList, flowName); + log.trace("Ports {} added to FlowEntry {}", portList, flowName); } else { log.warn("Failed to add ports {} to Flow entry {}. The failure is: {}", portList, currentFlowEntry.toString(), error.getDescription()); @@ -1287,7 +1287,7 @@ public class ForwardingRulesManager implements } Status status = modifyEntry(currentFlowEntry, newFlowEntry, false); if (status.isSuccess()) { - log.info("Ports {} removed from FlowEntry {}", portList, flowName); + log.trace("Ports {} removed from FlowEntry {}", portList, flowName); } else { log.warn("Failed to remove ports {} from Flow entry {}. The failure is: {}", portList, currentFlowEntry.toString(), status.getDescription()); @@ -1335,7 +1335,7 @@ public class ForwardingRulesManager implements Status status = modifyEntry(currentFlowEntry, newFlowEntry, false); if (status.isSuccess()) { - log.info("Output port replaced with {} for flow {} on node {}", outPort, flowName, node); + log.trace("Output port replaced with {} for flow {} on node {}", outPort, flowName, node); } else { log.warn("Failed to replace output port for flow {} on node {}. The failure is: {}", flowName, node, status.getDescription()); @@ -1793,7 +1793,7 @@ public class ForwardingRulesManager implements // Do not attempt to reinstall the flow, warn user if (newFlowConfig.equals(oldFlowConfig)) { String msg = "No modification detected"; - log.info("Static flow modification skipped. New flow and old flow are the same: {}", newFlowConfig); + log.trace("Static flow modification skipped. New flow and old flow are the same: {}", newFlowConfig); return new Status(StatusCode.SUCCESS, msg); } @@ -1895,7 +1895,7 @@ public class ForwardingRulesManager implements * inactive list */ private void uninstallAllFlowEntries(boolean preserveFlowEntries) { - log.info("Uninstalling all non-internal flows"); + log.trace("Uninstalling all non-internal flows"); List toRemove = new ArrayList(); @@ -1933,7 +1933,7 @@ public class ForwardingRulesManager implements * default container instance of FRM only when the last container is deleted */ private void reinstallAllFlowEntries() { - log.info("Reinstalling all inactive flows"); + log.trace("Reinstalling all inactive flows"); for (FlowEntry flowEntry : this.inactiveFlows.keySet()) { this.addEntry(flowEntry, false); @@ -2118,11 +2118,11 @@ public class ForwardingRulesManager implements dropAllConfig.setActions(dropAction); defaultConfigs.add(dropAllConfig); - log.info("Forwarding mode for node {} set to {}", node, (proactive ? "proactive" : "reactive")); + log.trace("Forwarding mode for node {} set to {}", node, (proactive ? "proactive" : "reactive")); for (FlowConfig fc : defaultConfigs) { Status status = (proactive) ? addStaticFlowInternal(fc, false) : removeStaticFlow(fc); if (status.isSuccess()) { - log.info("{} Proactive Static flow: {}", (proactive ? "Installed" : "Removed"), fc.getName()); + log.trace("{} Proactive Static flow: {}", (proactive ? "Installed" : "Removed"), fc.getName()); } else { log.warn("Failed to {} Proactive Static flow: {}", (proactive ? "install" : "remove"), fc.getName()); @@ -2145,7 +2145,7 @@ public class ForwardingRulesManager implements * @param node */ private void cleanDatabaseForNode(Node node) { - log.info("Cleaning Flow database for Node {}", node); + log.trace("Cleaning Flow database for Node {}", node); if (nodeFlows.containsKey(node)) { List toRemove = new ArrayList(nodeFlows.get(node)); @@ -2322,7 +2322,7 @@ public class ForwardingRulesManager implements @Override public void portGroupChanged(PortGroupConfig config, Map data, boolean add) { - log.info("PortGroup Changed for: {} Data: {}", config, portGroupData); + log.trace("PortGroup Changed for: {} Data: {}", config, portGroupData); Map existingData = portGroupData.get(config); if (existingData != null) { for (Map.Entry entry : data.entrySet()) { diff --git a/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java b/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java index b231faf153..0e27417587 100644 --- a/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java +++ b/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java @@ -76,7 +76,7 @@ public class Activator implements BundleActivator { log.warn("Invalid policy name \"{}\", defaulting to {}", policy, handler); } } - log.info("Setting uncaught exception policy to {}", handler); + log.trace("Setting uncaught exception policy to {}", handler); Thread.setDefaultUncaughtExceptionHandler(handler); /* diff --git a/opendaylight/md-sal/clustered-data-store/implementation/src/main/java/org/opendaylight/controller/datastore/internal/ClusteredDataStoreImpl.java b/opendaylight/md-sal/clustered-data-store/implementation/src/main/java/org/opendaylight/controller/datastore/internal/ClusteredDataStoreImpl.java index 5449c839f5..0809ba347b 100644 --- a/opendaylight/md-sal/clustered-data-store/implementation/src/main/java/org/opendaylight/controller/datastore/internal/ClusteredDataStoreImpl.java +++ b/opendaylight/md-sal/clustered-data-store/implementation/src/main/java/org/opendaylight/controller/datastore/internal/ClusteredDataStoreImpl.java @@ -45,7 +45,7 @@ public class ClusteredDataStoreImpl implements ClusteredDataStore { private Logger logger = LoggerFactory.getLogger(ClusteredDataStoreImpl.class); public ClusteredDataStoreImpl(IClusterGlobalServices clusterGlobalServices) throws CacheConfigException { - logger.info("Constructing clustered data store"); + logger.trace("Constructing clustered data store"); Preconditions.checkNotNull(clusterGlobalServices, "clusterGlobalServices cannot be null"); operationalDataCache = getOrCreateCache(clusterGlobalServices, OPERATIONAL_DATA_CACHE); @@ -72,24 +72,24 @@ public class ClusteredDataStoreImpl implements ClusteredDataStore { public boolean containsConfigurationPath(InstanceIdentifier path) { return configurationDataCache.containsKey(path); } - + @Override public boolean containsOperationalPath(InstanceIdentifier path) { return operationalDataCache.containsKey(path); } - + @Override public Iterable getStoredConfigurationPaths() { return configurationDataCache.keySet(); } - + @Override public Iterable getStoredOperationalPaths() { return operationalDataCache.keySet(); } - - - + + + @Override public CompositeNode readConfigurationData(InstanceIdentifier path) { Preconditions.checkNotNull(path, "path cannot be null"); diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryAndReadAdapter.xtend b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryAndReadAdapter.xtend index 21af047c3d..39d224ba16 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryAndReadAdapter.xtend +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryAndReadAdapter.xtend @@ -142,7 +142,7 @@ class InventoryAndReadAdapter implements IPluginInReadService, val table= it.readConfigurationData(tableRef) as Table; if(table != null){ - LOG.info("Number of flows installed in table 0 of node {} : {}",node,table.flow.size); + LOG.trace("Number of flows installed in table 0 of node {} : {}",node,table.flow.size); for(flow : table.flow){ @@ -248,7 +248,7 @@ class InventoryAndReadAdapter implements IPluginInReadService, val table= it.readConfigurationData(tableRef) as Table; if(table != null){ - LOG.info("Number of flows installed in table 0 of node {} : {}",node,table.flow.size); + LOG.trace("Number of flows installed in table 0 of node {} : {}",node,table.flow.size); for(mdsalFlow : table.flow){ if(FromSalConversionsUtils.flowEquals(mdsalFlow, MDFlowMapping.toMDSalflow(targetFlow))){ diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/RuntimeGeneratedMappingServiceImpl.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/RuntimeGeneratedMappingServiceImpl.xtend index 1b3acf7674..7461ba8926 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/RuntimeGeneratedMappingServiceImpl.xtend +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/RuntimeGeneratedMappingServiceImpl.xtend @@ -260,7 +260,7 @@ class RuntimeGeneratedMappingServiceImpl implements BindingIndependentMappingSer if (typeDef !== null) { return typeDef; } - LOG.info("Thread blocked waiting for schema for: {}",type.fullyQualifiedName) + LOG.trace("Thread blocked waiting for schema for: {}",type.fullyQualifiedName) return type.getSchemaInFuture.get(); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/TransformerGenerator.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/TransformerGenerator.xtend index b22f328778..f68f94e32a 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/TransformerGenerator.xtend +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/TransformerGenerator.xtend @@ -1102,7 +1102,7 @@ class TransformerGenerator { } private def createDummyImplementation(Class object, GeneratedTransferObject typeSpec) { - log.info("Generating Dummy DOM Codec for {} with {}", object, object.classLoader) + log.trace("Generating Dummy DOM Codec for {} with {}", object, object.classLoader) return createClass(typeSpec.codecClassName) [ if (object.isYangBindingAvailable) { implementsType(BINDING_CODEC) diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend index b4fd6b6771..a3c8c5f232 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend @@ -185,13 +185,13 @@ class NotifyTask implements Callable { if(log.isDebugEnabled){ log.debug("Delivering notification {} to {}",notification,listener); } else { - log.info("Delivering notification {} to {}",notification.class.name,listener); + log.trace("Delivering notification {} to {}",notification.class.name,listener); } listener.onNotification(notification); if(log.isDebugEnabled){ log.debug("Notification delivered {} to {}",notification,listener); } else { - log.info("Notification delivered {} to {}",notification.class.name,listener); + log.trace("Notification delivered {} to {}",notification.class.name,listener); } } catch (Exception e) { log.error("Unhandled exception thrown by listener: {}", listener, e); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java index 7a7e086ec4..e691a453b5 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java @@ -444,7 +444,7 @@ public class BindingIndependentConnector implements // } DataModificationTransaction domTransaction = createBindingToDomTransaction(bindingTransaction); BindingToDomTransaction wrapped = new BindingToDomTransaction(domTransaction, bindingTransaction); - LOG.info("Forwarding Binding Transaction: {} as DOM Transaction: {} .", bindingTransaction.getIdentifier(), + LOG.trace("Forwarding Binding Transaction: {} as DOM Transaction: {} .", bindingTransaction.getIdentifier(), domTransaction.getIdentifier()); return wrapped; } @@ -484,7 +484,7 @@ public class BindingIndependentConnector implements // org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction baTransaction = createDomToBindingTransaction(domTransaction); DomToBindingTransaction forwardedTransaction = new DomToBindingTransaction(baTransaction, domTransaction); - LOG.info("Forwarding DOM Transaction: {} as Binding Transaction: {}.", domTransaction.getIdentifier(), + LOG.trace("Forwarding DOM Transaction: {} as Binding Transaction: {}.", domTransaction.getIdentifier(), baTransaction.getIdentifier()); return forwardedTransaction; } diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend index f90465f925..d86547ab99 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend @@ -85,7 +85,7 @@ DataProvisionService { override final registerCommitHandler(P path, DataCommitHandler commitHandler) { val registration = new DataCommitHandlerRegistrationImpl(path, commitHandler, this); commitHandlers.put(path, registration) - LOG.info("Registering Commit Handler {} for path: {}",commitHandler,path); + LOG.trace("Registering Commit Handler {} for path: {}",commitHandler,path); for(listener : commitHandlerRegistrationListeners) { try { listener.instance.onRegister(registration); @@ -132,7 +132,7 @@ DataProvisionService { protected final def removeCommitHandler(DataCommitHandlerRegistrationImpl registration) { commitHandlers.remove(registration.path, registration); - LOG.info("Removing Commit Handler {} for path: {}",registration.instance,registration.path); + LOG.trace("Removing Commit Handler {} for path: {}",registration.instance,registration.path); for(listener : commitHandlerRegistrationListeners) { try { listener.instance.onUnregister(registration); @@ -264,7 +264,7 @@ package class TwoPhaseCommit

, D, DCL extends DataChangeListene val transactionId = transaction.identifier; - log.info("Transaction: {} Started.",transactionId); + log.trace("Transaction: {} Started.",transactionId); // requesting commits val Iterable> commitHandlers = dataBroker.affectedCommitHandlers(affectedPaths); val List> handlerTransactions = new ArrayList(); @@ -288,7 +288,7 @@ package class TwoPhaseCommit

, D, DCL extends DataChangeListene dataBroker.failedTransactionsCount.andIncrement return rollback(handlerTransactions, e); } - log.info("Transaction: {} Finished successfully.",transactionId); + log.trace("Transaction: {} Finished successfully.",transactionId); dataBroker.finishedTransactionsCount.andIncrement; return Rpcs.getRpcResult(true, TransactionStatus.COMMITED, Collections.emptySet()); diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.xtend b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.xtend index 4c84440c7e..aa5138a04d 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.xtend +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.xtend @@ -57,7 +57,7 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { override registerConsumer(Consumer consumer, BundleContext ctx) { checkPredicates(consumer); - log.info("Registering consumer " + consumer); + log.trace("Registering consumer " + consumer); val session = newSessionFor(consumer, ctx); consumer.onSessionInitiated(session); sessions.add(session); diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java index 8c272e5a4c..403f7c8da0 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java @@ -83,7 +83,7 @@ public class NotificationModule implements BrokerModule { private void sendNotification(CompositeNode notification) { QName type = notification.getNodeType(); Collection toNotify = listeners.get(type); - log.info("Publishing notification " + type); + log.trace("Publishing notification " + type); if (toNotify == null) { // No listeners were registered - returns. @@ -118,7 +118,7 @@ public class NotificationModule implements BrokerModule { .create(); private boolean closed = false; - + public Registration addNotificationListener(QName notification, NotificationListener listener) { checkSessionState(); @@ -132,7 +132,7 @@ public class NotificationModule implements BrokerModule { consumerListeners.put(notification, listener); listeners.put(notification, listener); - log.info("Registered listener for notification: " + notification); + log.trace("Registered listener for notification: " + notification); return null; // Return registration Object. } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/SchemaServiceImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/SchemaServiceImpl.java index 8afa1eeb5f..5fdd25c9e3 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/SchemaServiceImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/SchemaServiceImpl.java @@ -165,7 +165,7 @@ public class SchemaServiceImpl implements // inconsistentBundlesToYangURLs.clear(); // update cache updateCache(snapshot); - logger.info("SchemaService updated to new consistent state"); + logger.trace("SchemaService updated to new consistent state"); logger.trace("SchemaService updated to new consistent state containing {}", consistentBundlesToYangURLs); // notifyListeners(changedURLs, adding); diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/NotificationRouterImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/NotificationRouterImpl.java index 6d7b600dbc..6242dee038 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/NotificationRouterImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/NotificationRouterImpl.java @@ -43,7 +43,7 @@ public class NotificationRouterImpl implements NotificationRouter { private void sendNotification(CompositeNode notification) { QName type = notification.getNodeType(); Collection> toNotify = listeners.get(type); - log.info("Publishing notification " + type); + log.trace("Publishing notification " + type); if (toNotify == null) { // No listeners were registered - returns. diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java index 75e96491b6..8dc65e2ced 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java @@ -131,7 +131,7 @@ public class SchemaAwareDataStoreAdapter extends AbstractLockableDelegator request.addLeaf("version", revision.get()); } - device.logger.info("Loading YANG schema source for {}:{}", moduleName, revision); + device.logger.trace("Loading YANG schema source for {}:{}", moduleName, revision); RpcResult schemaReply = device.invokeRpc(GET_SCHEMA_QNAME, request.toInstance()); if (schemaReply.isSuccessful()) { String schemaBody = getSchemaFromRpc(schemaReply.getResult()); if (schemaBody != null) { - device.logger.info("YANG Schema successfully retrieved from remote for {}:{}", moduleName, revision); + device.logger.trace("YANG Schema successfully retrieved from remote for {}:{}", moduleName, revision); return Optional.of(schemaBody); } } - device.logger.info("YANG shcema was not successfully retrieved."); + device.logger.warn("YANG shcema was not successfully retrieved."); return Optional.absent(); } @@ -62,7 +62,7 @@ class NetconfRemoteSchemaSourceProvider implements SchemaSourceProvider } return null; } - + public static final boolean isSupportedFor(Set capabilities) { return capabilities.contains(IETF_NETCONF_MONITORING); } diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/BrokerFacade.xtend b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/BrokerFacade.xtend index 9c0c3ac14c..6e05d3f24a 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/BrokerFacade.xtend +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/BrokerFacade.xtend @@ -42,25 +42,25 @@ class BrokerFacade implements DataReader { override readConfigurationData(InstanceIdentifier path) { checkPreconditions - LOG.info("Read Configuration via Restconf: {}", path) + LOG.trace("Read Configuration via Restconf: {}", path) return dataService.readConfigurationData(path); } def readConfigurationDataBehindMountPoint(MountInstance mountPoint, InstanceIdentifier path) { checkPreconditions - LOG.info("Read Configuration via Restconf: {}", path) + LOG.trace("Read Configuration via Restconf: {}", path) return mountPoint.readConfigurationData(path); } override readOperationalData(InstanceIdentifier path) { checkPreconditions - LOG.info("Read Operational via Restconf: {}", path) + LOG.trace("Read Operational via Restconf: {}", path) return dataService.readOperationalData(path); } def readOperationalDataBehindMountPoint(MountInstance mountPoint, InstanceIdentifier path) { checkPreconditions - LOG.info("Read Operational via Restconf: {}", path) + LOG.trace("Read Operational via Restconf: {}", path) return mountPoint.readOperationalData(path); } @@ -73,7 +73,7 @@ class BrokerFacade implements DataReader { def commitConfigurationDataPut(InstanceIdentifier path, CompositeNode payload) { checkPreconditions val transaction = dataService.beginTransaction; - LOG.info("Put Configuration via Restconf: {}", path) + LOG.trace("Put Configuration via Restconf: {}", path) transaction.putConfigurationData(path, payload); return transaction.commit } @@ -81,7 +81,7 @@ class BrokerFacade implements DataReader { def commitConfigurationDataPutBehindMountPoint(MountInstance mountPoint, InstanceIdentifier path, CompositeNode payload) { checkPreconditions val transaction = mountPoint.beginTransaction; - LOG.info("Put Configuration via Restconf: {}", path) + LOG.trace("Put Configuration via Restconf: {}", path) transaction.putConfigurationData(path, payload); return transaction.commit } @@ -91,10 +91,10 @@ class BrokerFacade implements DataReader { val transaction = dataService.beginTransaction; transaction.putConfigurationData(path, payload); if (payload == transaction.createdConfigurationData.get(path)) { - LOG.info("Post Configuration via Restconf: {}", path) + LOG.trace("Post Configuration via Restconf: {}", path) return transaction.commit } - LOG.info("Post Configuration via Restconf was not executed because data already exists: {}", path) + LOG.trace("Post Configuration via Restconf was not executed because data already exists: {}", path) return null; } @@ -103,10 +103,10 @@ class BrokerFacade implements DataReader { val transaction = mountPoint.beginTransaction; transaction.putConfigurationData(path, payload); if (payload == transaction.createdConfigurationData.get(path)) { - LOG.info("Post Configuration via Restconf: {}", path) + LOG.trace("Post Configuration via Restconf: {}", path) return transaction.commit } - LOG.info("Post Configuration via Restconf was not executed because data already exists: {}", path) + LOG.trace("Post Configuration via Restconf was not executed because data already exists: {}", path) return null; } diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/impl/ToastConsumerImpl.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/impl/ToastConsumerImpl.java index 91146f3c2e..fde60d64ce 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/impl/ToastConsumerImpl.java +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/impl/ToastConsumerImpl.java @@ -49,18 +49,18 @@ public class ToastConsumerImpl extends AbstractBindingAwareConsumer implements B RpcResult result = getToastService().makeToast(toastInput.build()).get(); if (result.isSuccessful()) { - log.info("Toast was successfuly finished"); + log.trace("Toast was successfuly finished"); } else { - log.info("Toast was not successfuly finished"); + log.warn("Toast was not successfuly finished"); } return result.isSuccessful(); } catch (InterruptedException | ExecutionException e) { - log.info("Error occured during toast creation"); + log.warn("Error occured during toast creation"); } return false; } - + @Override @Deprecated protected void startImpl(BundleContext context) { @@ -76,7 +76,7 @@ public class ToastConsumerImpl extends AbstractBindingAwareConsumer implements B @Override public void onNotification(ToastDone notification) { - log.info("ToastDone Notification Received: {} ",notification.getToastStatus()); + log.trace("ToastDone Notification Received: {} ",notification.getToastStatus()); } diff --git a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java index f54213e287..ce541bae20 100644 --- a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java +++ b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java @@ -64,7 +64,7 @@ public class OpendaylightToaster implements ToasterData, ToasterService { @Override public Future> makeToast(MakeToastInput input) { // TODO Auto-generated method stub - log.info("makeToast - Received input for toast"); + log.trace("makeToast - Received input for toast"); logToastInput(input); if (currentTask != null) { return inProgressError(); @@ -92,7 +92,7 @@ public class OpendaylightToaster implements ToasterData, ToasterService { private void logToastInput(MakeToastInput input) { String toastType = input.getToasterToastType().getName(); String toastDoneness = input.getToasterDoneness().toString(); - log.info("Toast: {} doneness: {}", toastType, toastDoneness); + log.trace("Toast: {} doneness: {}", toastType, toastDoneness); } private class MakeToastTask implements Callable> { @@ -110,7 +110,7 @@ public class OpendaylightToaster implements ToasterData, ToasterService { ToastDoneBuilder notifyBuilder = new ToastDoneBuilder(); notifyBuilder.setToastStatus(ToastStatus.Done); notificationProvider.notify(notifyBuilder.build()); - log.info("Toast Done"); + log.trace("Toast Done"); logToastInput(toastRequest); currentTask = null; return Rpcs. getRpcResult(true, null, Collections. emptySet()); diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java index bb5dea3bd5..4eaad42738 100644 --- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java +++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java @@ -60,17 +60,17 @@ import org.slf4j.LoggerFactory; public class StatisticsProvider implements AutoCloseable { public final static Logger spLogger = LoggerFactory.getLogger(StatisticsProvider.class); - + private DataProviderService dps; private NotificationProviderService nps; - + private OpendaylightGroupStatisticsService groupStatsService; - + private OpendaylightMeterStatisticsService meterStatsService; - + private OpendaylightFlowStatisticsService flowStatsService; - + private OpendaylightPortStatisticsService portStatsService; private OpendaylightFlowTableStatisticsService flowTableStatsService; @@ -78,29 +78,29 @@ public class StatisticsProvider implements AutoCloseable { private OpendaylightQueueStatisticsService queueStatsService; private final MultipartMessageManager multipartMessageManager = new MultipartMessageManager(); - + private Thread statisticsRequesterThread; - + private final InstanceIdentifier nodesIdentifier = InstanceIdentifier.builder(Nodes.class).toInstance(); - + private final int STATS_THREAD_EXECUTION_TIME= 50000; //Local caching of stats - - private final ConcurrentMap statisticsCache = + + private final ConcurrentMap statisticsCache = new ConcurrentHashMap(); - + public DataProviderService getDataService() { return this.dps; } - + public void setDataService(final DataProviderService dataService) { this.dps = dataService; } - + public NotificationProviderService getNotificationService() { return this.nps; } - + public void setNotificationService(final NotificationProviderService notificationService) { this.nps = notificationService; } @@ -110,22 +110,22 @@ public class StatisticsProvider implements AutoCloseable { } private final StatisticsUpdateCommiter updateCommiter = new StatisticsUpdateCommiter(StatisticsProvider.this); - + private Registration listenerRegistration; - + public void start() { - + NotificationProviderService nps = this.getNotificationService(); Registration registerNotificationListener = nps.registerNotificationListener(this.updateCommiter); this.listenerRegistration = registerNotificationListener; - + // Get Group/Meter statistics service instance groupStatsService = StatisticsManagerActivator.getProviderContext(). getRpcService(OpendaylightGroupStatisticsService.class); - + meterStatsService = StatisticsManagerActivator.getProviderContext(). getRpcService(OpendaylightMeterStatisticsService.class); - + flowStatsService = StatisticsManagerActivator.getProviderContext(). getRpcService(OpendaylightFlowStatisticsService.class); @@ -134,10 +134,10 @@ public class StatisticsProvider implements AutoCloseable { flowTableStatsService = StatisticsManagerActivator.getProviderContext(). getRpcService(OpendaylightFlowTableStatisticsService.class); - + queueStatsService = StatisticsManagerActivator.getProviderContext(). getRpcService(OpendaylightQueueStatisticsService.class); - + statisticsRequesterThread = new Thread( new Runnable(){ @Override @@ -145,7 +145,7 @@ public class StatisticsProvider implements AutoCloseable { while(true){ try { statsRequestSender(); - + Thread.sleep(STATS_THREAD_EXECUTION_TIME); }catch (Exception e){ spLogger.error("Exception occurred while sending stats request : {}",e); @@ -153,55 +153,55 @@ public class StatisticsProvider implements AutoCloseable { } } }); - + spLogger.debug("Statistics requester thread started with timer interval : {}",STATS_THREAD_EXECUTION_TIME); - + statisticsRequesterThread.start(); - + spLogger.info("Statistics Provider started."); } - + protected DataModificationTransaction startChange() { - + DataProviderService dps = this.getDataService(); return dps.beginTransaction(); } - + private void statsRequestSender(){ - + List targetNodes = getAllConnectedNodes(); - + if(targetNodes == null) return; - + for (Node targetNode : targetNodes){ - + if(targetNode.getAugmentation(FlowCapableNode.class) != null){ - spLogger.info("Send request for stats collection to node : {})",targetNode.getId()); - + spLogger.trace("Send request for stats collection to node : {})",targetNode.getId()); + InstanceIdentifier targetInstanceId = InstanceIdentifier.builder(Nodes.class).child(Node.class,targetNode.getKey()).toInstance(); - + NodeRef targetNodeRef = new NodeRef(targetInstanceId); - + try{ sendAggregateFlowsStatsFromAllTablesRequest(targetNode.getKey()); - + sendAllFlowsStatsFromAllTablesRequest(targetNodeRef); sendAllNodeConnectorsStatisticsRequest(targetNodeRef); - + sendAllFlowTablesStatisticsRequest(targetNodeRef); - + sendAllQueueStatsFromAllNodeConnector (targetNodeRef); sendAllGroupStatisticsRequest(targetNodeRef); - + sendAllMeterStatisticsRequest(targetNodeRef); - + sendGroupDescriptionRequest(targetNodeRef); - + sendMeterConfigStatisticsRequest(targetNodeRef); }catch(Exception e){ spLogger.error("Exception occured while sending statistics requests : {}", e); @@ -211,12 +211,12 @@ public class StatisticsProvider implements AutoCloseable { } private void sendAllFlowTablesStatisticsRequest(NodeRef targetNodeRef) throws InterruptedException, ExecutionException { - final GetFlowTablesStatisticsInputBuilder input = + final GetFlowTablesStatisticsInputBuilder input = new GetFlowTablesStatisticsInputBuilder(); - + input.setNode(targetNodeRef); - Future> response = + Future> response = flowTableStatsService.getFlowTablesStatistics(input.build()); this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() @@ -227,33 +227,33 @@ public class StatisticsProvider implements AutoCloseable { private void sendAllFlowsStatsFromAllTablesRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ final GetAllFlowsStatisticsFromAllFlowTablesInputBuilder input = new GetAllFlowsStatisticsFromAllFlowTablesInputBuilder(); - + input.setNode(targetNode); - - Future> response = + + Future> response = flowStatsService.getAllFlowsStatisticsFromAllFlowTables(input.build()); - + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() , StatsRequestType.ALL_FLOW); - + } - + private void sendAggregateFlowsStatsFromAllTablesRequest(NodeKey targetNodeKey) throws InterruptedException, ExecutionException{ - + List tablesId = getTablesFromNode(targetNodeKey); - + if(tablesId.size() != 0){ for(Short id : tablesId){ - - spLogger.info("Send aggregate stats request for flow table {} to node {}",id,targetNodeKey); - GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder input = + + spLogger.trace("Send aggregate stats request for flow table {} to node {}",id,targetNodeKey); + GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder input = new GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder(); - + input.setNode(new NodeRef(InstanceIdentifier.builder(Nodes.class).child(Node.class, targetNodeKey).toInstance())); input.setTableId(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableId(id)); - Future> response = + Future> response = flowStatsService.getAggregateFlowStatisticsFromFlowTableForAllFlows(input.build()); - + multipartMessageManager.setTxIdAndTableIdMapEntry(response.get().getResult().getTransactionId(), id); this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() , StatsRequestType.AGGR_FLOW); @@ -264,12 +264,12 @@ public class StatisticsProvider implements AutoCloseable { } private void sendAllNodeConnectorsStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ - + final GetAllNodeConnectorsStatisticsInputBuilder input = new GetAllNodeConnectorsStatisticsInputBuilder(); - + input.setNode(targetNode); - Future> response = + Future> response = portStatsService.getAllNodeConnectorsStatistics(input.build()); this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() , StatsRequestType.ALL_PORT); @@ -277,68 +277,68 @@ public class StatisticsProvider implements AutoCloseable { } private void sendAllGroupStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ - + final GetAllGroupStatisticsInputBuilder input = new GetAllGroupStatisticsInputBuilder(); - + input.setNode(targetNode); - Future> response = + Future> response = groupStatsService.getAllGroupStatistics(input.build()); - + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() , StatsRequestType.ALL_GROUP); } - + private void sendGroupDescriptionRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder(); - + input.setNode(targetNode); - Future> response = + Future> response = groupStatsService.getGroupDescription(input.build()); this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() , StatsRequestType.GROUP_DESC); } - + private void sendAllMeterStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ - + GetAllMeterStatisticsInputBuilder input = new GetAllMeterStatisticsInputBuilder(); - + input.setNode(targetNode); - Future> response = + Future> response = meterStatsService.getAllMeterStatistics(input.build()); - + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() , StatsRequestType.ALL_METER);; } - + private void sendMeterConfigStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ - + GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder(); - + input.setNode(targetNode); - Future> response = + Future> response = meterStatsService.getAllMeterConfigStatistics(input.build()); - + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() , StatsRequestType.METER_CONFIG);; } - + private void sendAllQueueStatsFromAllNodeConnector(NodeRef targetNode) throws InterruptedException, ExecutionException { GetAllQueuesStatisticsFromAllPortsInputBuilder input = new GetAllQueuesStatisticsFromAllPortsInputBuilder(); - + input.setNode(targetNode); - - Future> response = + + Future> response = queueStatsService.getAllQueuesStatisticsFromAllPorts(input.build()); - + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() , StatsRequestType.ALL_QUEUE_STATS);; @@ -347,24 +347,24 @@ public class StatisticsProvider implements AutoCloseable { public ConcurrentMap getStatisticsCache() { return statisticsCache; } - + private List getAllConnectedNodes(){ - + Nodes nodes = (Nodes) dps.readOperationalData(nodesIdentifier); if(nodes == null) return null; - - spLogger.info("Number of connected nodes : {}",nodes.getNode().size()); + + spLogger.trace("Number of connected nodes : {}",nodes.getNode().size()); return nodes.getNode(); } - + private List getTablesFromNode(NodeKey nodeKey){ InstanceIdentifier nodesIdentifier = InstanceIdentifier.builder(Nodes.class).child(Node.class,nodeKey).augmentation(FlowCapableNode.class).toInstance(); - + FlowCapableNode node = (FlowCapableNode)dps.readOperationalData(nodesIdentifier); List tablesId = new ArrayList(); if(node != null && node.getTable()!=null){ - spLogger.info("Number of tables {} supported by node {}",node.getTable().size(),nodeKey); + spLogger.trace("Number of tables {} supported by node {}",node.getTable().size(),nodeKey); for(Table table: node.getTable()){ tablesId.add(table.getId()); } @@ -375,15 +375,15 @@ public class StatisticsProvider implements AutoCloseable { @SuppressWarnings("deprecation") @Override public void close(){ - + try { - spLogger.info("Statistics Provider stopped."); + spLogger.trace("Statistics Provider stopped."); if (this.listenerRegistration != null) { - + this.listenerRegistration.close(); - + this.statisticsRequesterThread.destroy(); - + } } catch (Throwable e) { throw Exceptions.sneakyThrow(e); diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java index f3188e1d0e..5743865d39 100644 --- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java +++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java @@ -108,68 +108,68 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Class implement statistics manager related listener interface and augment all the + * Class implement statistics manager related listener interface and augment all the * received statistics data to data stores. - * TODO: Need to add error message listener and clean-up the associated tx id + * TODO: Need to add error message listener and clean-up the associated tx id * if it exists in the tx-id cache. * @author vishnoianil * */ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsListener, - OpendaylightMeterStatisticsListener, + OpendaylightMeterStatisticsListener, OpendaylightFlowStatisticsListener, OpendaylightPortStatisticsListener, OpendaylightFlowTableStatisticsListener, OpendaylightQueueStatisticsListener{ - + public final static Logger sucLogger = LoggerFactory.getLogger(StatisticsUpdateCommiter.class); private final StatisticsProvider statisticsManager; - + private final int unaccountedFlowsCounter = 1; public StatisticsUpdateCommiter(final StatisticsProvider manager){ this.statisticsManager = manager; } - + public StatisticsProvider getStatisticsManager(){ return statisticsManager; } - + @Override public void onMeterConfigStatsUpdated(MeterConfigStatsUpdated notification) { //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; - + //Add statistics to local cache ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ cache.put(notification.getId(), new NodeStatistics()); } cache.get(notification.getId()).setMeterConfigStats(notification.getMeterConfigStats()); - + //Publish data to configuration data store NodeKey key = new NodeKey(notification.getId()); - + List eterConfigStatsList = notification.getMeterConfigStats(); - + for(MeterConfigStats meterConfigStats : eterConfigStatsList){ DataModificationTransaction it = this.statisticsManager.startChange(); MeterBuilder meterBuilder = new MeterBuilder(); MeterKey meterKey = new MeterKey(meterConfigStats.getMeterId()); meterBuilder.setKey(meterKey); - + InstanceIdentifier meterRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) .augmentation(FlowCapableNode.class) .child(Meter.class,meterKey).toInstance(); - + NodeMeterConfigStatsBuilder meterConfig= new NodeMeterConfigStatsBuilder(); MeterConfigStatsBuilder stats = new MeterConfigStatsBuilder(); stats.fieldsFrom(meterConfigStats); meterConfig.setMeterConfigStats(stats.build()); - + //Update augmented data meterBuilder.addAugmentation(NodeMeterConfigStats.class, meterConfig.build()); it.putOperationalData(meterRef, meterBuilder.build()); @@ -180,7 +180,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onMeterStatisticsUpdated(MeterStatisticsUpdated notification) { - + //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; @@ -191,11 +191,11 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList cache.put(notification.getId(), new NodeStatistics()); } cache.get(notification.getId()).setMeterStatistics(notification.getMeterStats()); - + NodeKey key = new NodeKey(notification.getId()); - + List meterStatsList = notification.getMeterStats(); - + for(MeterStats meterStats : meterStatsList){ //Publish data to configuration data store @@ -203,11 +203,11 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList MeterBuilder meterBuilder = new MeterBuilder(); MeterKey meterKey = new MeterKey(meterStats.getMeterId()); meterBuilder.setKey(meterKey); - + InstanceIdentifier meterRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) .augmentation(FlowCapableNode.class) .child(Meter.class,meterKey).toInstance(); - + NodeMeterStatisticsBuilder meterStatsBuilder= new NodeMeterStatisticsBuilder(); MeterStatisticsBuilder stats = new MeterStatisticsBuilder(); stats.fieldsFrom(meterStats); @@ -222,7 +222,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onGroupDescStatsUpdated(GroupDescStatsUpdated notification) { - + //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; @@ -233,18 +233,18 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList cache.put(notification.getId(), new NodeStatistics()); } cache.get(notification.getId()).setGroupDescStats(notification.getGroupDescStats()); - + //Publish data to configuration data store NodeKey key = new NodeKey(notification.getId()); List groupDescStatsList = notification.getGroupDescStats(); for(GroupDescStats groupDescStats : groupDescStatsList){ DataModificationTransaction it = this.statisticsManager.startChange(); - + GroupBuilder groupBuilder = new GroupBuilder(); GroupKey groupKey = new GroupKey(groupDescStats.getGroupId()); groupBuilder.setKey(groupKey); - + InstanceIdentifier groupRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) .augmentation(FlowCapableNode.class) .child(Group.class,groupKey).toInstance(); @@ -253,7 +253,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList GroupDescBuilder stats = new GroupDescBuilder(); stats.fieldsFrom(groupDescStats); groupDesc.setGroupDesc(stats.build()); - + //Update augmented data groupBuilder.addAugmentation(NodeGroupDescStats.class, groupDesc.build()); @@ -264,7 +264,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onGroupStatisticsUpdated(GroupStatisticsUpdated notification) { - + //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; @@ -275,18 +275,18 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList cache.put(notification.getId(), new NodeStatistics()); } cache.get(notification.getId()).setGroupStatistics(notification.getGroupStats()); - + //Publish data to configuration data store NodeKey key = new NodeKey(notification.getId()); List groupStatsList = notification.getGroupStats(); for(GroupStats groupStats : groupStatsList){ DataModificationTransaction it = this.statisticsManager.startChange(); - + GroupBuilder groupBuilder = new GroupBuilder(); GroupKey groupKey = new GroupKey(groupStats.getGroupId()); groupBuilder.setKey(groupKey); - + InstanceIdentifier groupRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) .augmentation(FlowCapableNode.class) .child(Group.class,groupKey).toInstance(); @@ -295,14 +295,14 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList GroupStatisticsBuilder stats = new GroupStatisticsBuilder(); stats.fieldsFrom(groupStats); groupStatisticsBuilder.setGroupStatistics(stats.build()); - + //Update augmented data groupBuilder.addAugmentation(NodeGroupStatistics.class, groupStatisticsBuilder.build()); it.putOperationalData(groupRef, groupBuilder.build()); it.commit(); } } - + @Override public void onMeterFeaturesUpdated(MeterFeaturesUpdated notification) { @@ -317,28 +317,28 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList meterFeature.setMaxBands(notification.getMaxBands()); meterFeature.setMaxColor(notification.getMaxColor()); meterFeature.setMaxMeter(notification.getMaxMeter()); - + cache.get(notification.getId()).setMeterFeatures(meterFeature.build()); - + //Publish data to configuration data store DataModificationTransaction it = this.statisticsManager.startChange(); NodeKey key = new NodeKey(notification.getId()); NodeRef ref = getNodeRef(key); - - final NodeBuilder nodeData = new NodeBuilder(); + + final NodeBuilder nodeData = new NodeBuilder(); nodeData.setKey(key); - + NodeMeterFeaturesBuilder nodeMeterFeatures= new NodeMeterFeaturesBuilder(); nodeMeterFeatures.setMeterFeatures(meterFeature.build()); - + //Update augmented data nodeData.addAugmentation(NodeMeterFeatures.class, nodeMeterFeatures.build()); - + InstanceIdentifier refValue = ref.getValue(); it.putOperationalData(refValue, nodeData.build()); it.commit(); } - + @Override public void onGroupFeaturesUpdated(GroupFeaturesUpdated notification) { @@ -347,28 +347,28 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList if(!cache.containsKey(notification.getId())){ cache.put(notification.getId(), new NodeStatistics()); } - + GroupFeaturesBuilder groupFeatures = new GroupFeaturesBuilder(); groupFeatures.setActions(notification.getActions()); groupFeatures.setGroupCapabilitiesSupported(notification.getGroupCapabilitiesSupported()); groupFeatures.setGroupTypesSupported(notification.getGroupTypesSupported()); groupFeatures.setMaxGroups(notification.getMaxGroups()); cache.get(notification.getId()).setGroupFeatures(groupFeatures.build()); - + //Publish data to configuration data store DataModificationTransaction it = this.statisticsManager.startChange(); NodeKey key = new NodeKey(notification.getId()); NodeRef ref = getNodeRef(key); - - final NodeBuilder nodeData = new NodeBuilder(); + + final NodeBuilder nodeData = new NodeBuilder(); nodeData.setKey(key); - + NodeGroupFeaturesBuilder nodeGroupFeatures= new NodeGroupFeaturesBuilder(); nodeGroupFeatures.setGroupFeatures(groupFeatures.build()); - + //Update augmented data nodeData.addAugmentation(NodeGroupFeatures.class, nodeGroupFeatures.build()); - + InstanceIdentifier refValue = ref.getValue(); it.putOperationalData(refValue, nodeData.build()); it.commit(); @@ -376,17 +376,17 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onFlowsStatisticsUpdate(FlowsStatisticsUpdate notification) { - + //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received flow stats update : {}",notification.toString()); - + for(FlowAndStatisticsMapList map: notification.getFlowAndStatisticsMapList()){ short tableId = map.getTableId(); - + DataModificationTransaction it = this.statisticsManager.startChange(); boolean foundOriginalFlow = false; @@ -416,16 +416,16 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList flow.setPriority(map.getPriority()); flow.setStrict(map.isStrict()); flow.setTableId(tableId); - + Flow flowRule = flow.build(); - + FlowAndStatisticsMapListBuilder stats = new FlowAndStatisticsMapListBuilder(); stats.setByteCount(map.getByteCount()); stats.setPacketCount(map.getPacketCount()); stats.setDuration(map.getDuration()); - + GenericStatistics flowStats = stats.build(); - + //Add statistics to local cache ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ @@ -435,7 +435,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList cache.get(notification.getId()).getFlowAndStatsMap().put(tableId, new HashMap()); } cache.get(notification.getId()).getFlowAndStatsMap().get(tableId).put(flowRule,flowStats); - + //Augment the data to the flow node FlowStatisticsBuilder flowStatistics = new FlowStatisticsBuilder(); @@ -460,17 +460,17 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList flowStatistics.setTableId(tableId); flowStatisticsData.setFlowStatistics(flowStatistics.build()); - + sucLogger.debug("Flow : {}",flowRule.toString()); sucLogger.debug("Statistics to augment : {}",flowStatistics.build().toString()); InstanceIdentifier tableRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) .augmentation(FlowCapableNode.class).child(Table.class, new TableKey(tableId)).toInstance(); - + Table table= (Table)it.readConfigurationData(tableRef); //TODO: Not a good way to do it, need to figure out better way. - //TODO: major issue in any alternate approach is that flow key is incrementally assigned + //TODO: major issue in any alternate approach is that flow key is incrementally assigned //to the flows stored in data store. if(table != null){ @@ -483,7 +483,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList .child(Flow.class,existingFlow.getKey()).toInstance(); flowBuilder.setKey(existingFlow.getKey()); flowBuilder.addAugmentation(FlowStatisticsData.class, flowStatisticsData.build()); - sucLogger.info("Found matching flow in the datastore, augmenting statistics"); + sucLogger.trace("Found matching flow in the datastore, augmenting statistics"); foundOriginalFlow = true; it.putOperationalData(flowRef, flowBuilder.build()); it.commit(); @@ -491,7 +491,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } } } - + if(!foundOriginalFlow){ sucLogger.debug("Associated original flow is not found in data store. Augmenting flow in operational data store"); //TODO: Temporary fix: format [ 1+tableid+1+unaccounted flow counter] @@ -503,7 +503,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList .child(Flow.class,newFlowKey).toInstance(); flowBuilder.setKey(newFlowKey); flowBuilder.addAugmentation(FlowStatisticsData.class, flowStatisticsData.build()); - sucLogger.info("Flow was no present in data store, augmenting statistics as an unaccounted flow"); + sucLogger.trace("Flow was no present in data store, augmenting statistics as an unaccounted flow"); it.putOperationalData(flowRef, flowBuilder.build()); it.commit(); } @@ -518,10 +518,10 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received aggregate flow statistics update : {}",notification.toString()); - + Short tableId = this.statisticsManager.getMultipartMessageManager().getTableIdForTxId(notification.getTransactionId()); if(tableId != null){ - + DataModificationTransaction it = this.statisticsManager.startChange(); InstanceIdentifier
tableRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) @@ -533,13 +533,13 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList aggregateFlowStatisticsBuilder.setFlowCount(notification.getFlowCount()); aggregateFlowStatisticsBuilder.setPacketCount(notification.getPacketCount()); aggregateFlowStatisticsDataBuilder.setAggregateFlowStatistics(aggregateFlowStatisticsBuilder.build()); - + ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ cache.put(notification.getId(), new NodeStatistics()); } cache.get(notification.getId()).getTableAndAggregateFlowStatsMap().put(tableId,aggregateFlowStatisticsBuilder.build()); - + sucLogger.debug("Augment aggregate statistics: {} for table {} on Node {}",aggregateFlowStatisticsBuilder.build().toString(),tableId,key); TableBuilder tableBuilder = new TableBuilder(); @@ -559,7 +559,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received port stats update : {}",notification.toString()); - + //Add statistics to local cache ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ @@ -569,10 +569,10 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList List portsStats = notification.getNodeConnectorStatisticsAndPortNumberMap(); for(NodeConnectorStatisticsAndPortNumberMap portStats : portsStats){ - + DataModificationTransaction it = this.statisticsManager.startChange(); - FlowCapableNodeConnectorStatisticsBuilder statisticsBuilder + FlowCapableNodeConnectorStatisticsBuilder statisticsBuilder = new FlowCapableNodeConnectorStatisticsBuilder(); statisticsBuilder.setBytes(portStats.getBytes()); statisticsBuilder.setCollisionCount(portStats.getCollisionCount()); @@ -585,20 +585,20 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList statisticsBuilder.setReceiveOverRunError(portStats.getReceiveOverRunError()); statisticsBuilder.setTransmitDrops(portStats.getTransmitDrops()); statisticsBuilder.setTransmitErrors(portStats.getTransmitErrors()); - + //Update data in the cache cache.get(notification.getId()).getNodeConnectorStats().put(portStats.getNodeConnectorId(), statisticsBuilder.build()); - + //Augment data to the node-connector - FlowCapableNodeConnectorStatisticsDataBuilder statisticsDataBuilder = + FlowCapableNodeConnectorStatisticsDataBuilder statisticsDataBuilder = new FlowCapableNodeConnectorStatisticsDataBuilder(); - + statisticsDataBuilder.setFlowCapableNodeConnectorStatistics(statisticsBuilder.build()); - + InstanceIdentifier nodeConnectorRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key).child(NodeConnector.class, new NodeConnectorKey(portStats.getNodeConnectorId())).toInstance(); - + NodeConnector nodeConnector = (NodeConnector)it.readOperationalData(nodeConnectorRef); - + if(nodeConnector != null){ sucLogger.debug("Augmenting port statistics {} to port {}",statisticsDataBuilder.build().toString(),nodeConnectorRef.toString()); NodeConnectorBuilder nodeConnectorBuilder = new NodeConnectorBuilder(); @@ -617,32 +617,32 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received flow table statistics update : {}",notification.toString()); - + List flowTablesStatsList = notification.getFlowTableAndStatisticsMap(); for (FlowTableAndStatisticsMap ftStats : flowTablesStatsList){ - + DataModificationTransaction it = this.statisticsManager.startChange(); InstanceIdentifier
tableRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) .augmentation(FlowCapableNode.class).child(Table.class, new TableKey(ftStats.getTableId().getValue())).toInstance(); - + FlowTableStatisticsDataBuilder statisticsDataBuilder = new FlowTableStatisticsDataBuilder(); - + FlowTableStatisticsBuilder statisticsBuilder = new FlowTableStatisticsBuilder(); statisticsBuilder.setActiveFlows(ftStats.getActiveFlows()); statisticsBuilder.setPacketsLookedUp(ftStats.getPacketsLookedUp()); statisticsBuilder.setPacketsMatched(ftStats.getPacketsMatched()); - + statisticsDataBuilder.setFlowTableStatistics(statisticsBuilder.build()); - + ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ cache.put(notification.getId(), new NodeStatistics()); } cache.get(notification.getId()).getFlowTableAndStatisticsMap().put(ftStats.getTableId().getValue(),statisticsBuilder.build()); - + sucLogger.debug("Augment flow table statistics: {} for table {} on Node {}",statisticsBuilder.build().toString(),ftStats.getTableId(),key); - + TableBuilder tableBuilder = new TableBuilder(); tableBuilder.setKey(new TableKey(ftStats.getTableId().getValue())); tableBuilder.addAugmentation(FlowTableStatisticsData.class, statisticsDataBuilder.build()); @@ -653,70 +653,70 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onQueueStatisticsUpdate(QueueStatisticsUpdate notification) { - + //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received queue stats update : {}",notification.toString()); - + //Add statistics to local cache ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ cache.put(notification.getId(), new NodeStatistics()); } - + List queuesStats = notification.getQueueIdAndStatisticsMap(); for(QueueIdAndStatisticsMap swQueueStats : queuesStats){ - + if(!cache.get(notification.getId()).getNodeConnectorAndQueuesStatsMap().containsKey(swQueueStats.getNodeConnectorId())){ cache.get(notification.getId()).getNodeConnectorAndQueuesStatsMap().put(swQueueStats.getNodeConnectorId(), new HashMap()); } - + FlowCapableNodeConnectorQueueStatisticsDataBuilder queueStatisticsDataBuilder = new FlowCapableNodeConnectorQueueStatisticsDataBuilder(); - + FlowCapableNodeConnectorQueueStatisticsBuilder queueStatisticsBuilder = new FlowCapableNodeConnectorQueueStatisticsBuilder(); - + queueStatisticsBuilder.fieldsFrom(swQueueStats); - + queueStatisticsDataBuilder.setFlowCapableNodeConnectorQueueStatistics(queueStatisticsBuilder.build()); - + cache.get(notification.getId()).getNodeConnectorAndQueuesStatsMap() .get(swQueueStats.getNodeConnectorId()) .put(swQueueStats.getQueueId(), queueStatisticsBuilder.build()); - - + + DataModificationTransaction it = this.statisticsManager.startChange(); - InstanceIdentifier queueRef + InstanceIdentifier queueRef = InstanceIdentifier.builder(Nodes.class) .child(Node.class, key) .child(NodeConnector.class, new NodeConnectorKey(swQueueStats.getNodeConnectorId())) .augmentation(FlowCapableNodeConnector.class) .child(Queue.class, new QueueKey(swQueueStats.getQueueId())).toInstance(); - + QueueBuilder queueBuilder = new QueueBuilder(); queueBuilder.addAugmentation(FlowCapableNodeConnectorQueueStatisticsData.class, queueStatisticsDataBuilder.build()); queueBuilder.setKey(new QueueKey(swQueueStats.getQueueId())); - sucLogger.info("Augmenting queue statistics {} of queue {} to port {}" + sucLogger.trace("Augmenting queue statistics {} of queue {} to port {}" ,queueStatisticsDataBuilder.build().toString(), swQueueStats.getQueueId(), swQueueStats.getNodeConnectorId()); - + it.putOperationalData(queueRef, queueBuilder.build()); it.commit(); - + } - + } private NodeRef getNodeRef(NodeKey nodeKey){ InstanceIdentifierBuilder builder = InstanceIdentifier.builder(Nodes.class).child(Node.class, nodeKey); return new NodeRef(builder.toInstance()); } - + public boolean flowEquals(Flow statsFlow, Flow storedFlow) { if (statsFlow.getClass() != storedFlow.getClass()) { return false; @@ -780,28 +780,28 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } return true; } - + /** * Explicit equals method to compare the 'match' for flows stored in the data-stores and flow fetched from the switch. - * Usecase: e.g If user don't set any ethernet source and destination address for match,data store will store null for + * Usecase: e.g If user don't set any ethernet source and destination address for match,data store will store null for * these address. * e.g [_ethernetMatch=EthernetMatch [_ethernetDestination=null, _ethernetSource=null, _ethernetType= * EthernetType [_type=EtherType [_value=2048], _mask=null, augmentation=[]] - * - * But when you fetch the flows from switch, openflow driver library converts all zero bytes of mac address in the - * message stream to 00:00:00:00:00:00. Following string shows how library interpret the zero mac address bytes and - * eventually when translator convert it to MD-SAL match, this is how it looks - * [_ethernetDestination=EthernetDestination [_address=MacAddress [_value=00:00:00:00:00:00], _mask=null, augmentation=[]], - * _ethernetSource=EthernetSource [_address=MacAddress [_value=00:00:00:00:00:00], _mask=null, augmentation=[]], + * + * But when you fetch the flows from switch, openflow driver library converts all zero bytes of mac address in the + * message stream to 00:00:00:00:00:00. Following string shows how library interpret the zero mac address bytes and + * eventually when translator convert it to MD-SAL match, this is how it looks + * [_ethernetDestination=EthernetDestination [_address=MacAddress [_value=00:00:00:00:00:00], _mask=null, augmentation=[]], + * _ethernetSource=EthernetSource [_address=MacAddress [_value=00:00:00:00:00:00], _mask=null, augmentation=[]], * _ethernetType=EthernetType [_type=EtherType [_value=2048], _mask=null, augmentation=[]] - * - * Similarly for inPort, if user/application don't set any value for it, FRM will store null value for it in data store. + * + * Similarly for inPort, if user/application don't set any value for it, FRM will store null value for it in data store. * When we fetch the same flow (with its statistics) from switch, plugin converts its value to openflow:X:0. - * e.g _inPort=Uri [_value=openflow:1:0] - * + * e.g _inPort=Uri [_value=openflow:1:0] + * * So this custom equals method add additional check to take care of these scenario, in case any match element is null in data-store-flow, but not * in the flow fetched from switch. - * + * * @param statsFlow * @param storedFlow * @return diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Commit.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Commit.java index 8820d58a98..592d8e4f3b 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Commit.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Commit.java @@ -66,7 +66,7 @@ public class Commit extends AbstractConfigNetconfOperation { "Unable to retrieve config snapshot after commit for persister, details: " + e.getMessage(), ErrorType.application, ErrorTag.operation_failed, ErrorSeverity.error, e.getErrorInfo()); } - logger.info("Datastore {} committed successfully: {}", Datastore.candidate, status); + logger.trace("Datastore {} committed successfully: {}", Datastore.candidate, status); return document.createElement(XmlNetconfConstants.OK); } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/DiscardChanges.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/DiscardChanges.java index b8fa5dd86e..3da02a8430 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/DiscardChanges.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/DiscardChanges.java @@ -71,7 +71,7 @@ public class DiscardChanges extends AbstractConfigNetconfOperation { throw new NetconfDocumentedException(e.getMessage(), e, ErrorType.application, ErrorTag.operation_failed, ErrorSeverity.error, errorInfo); } - logger.info("Changes discarded successfully from datastore {}", Datastore.candidate); + logger.trace("Changes discarded successfully from datastore {}", Datastore.candidate); return document.createElement(XmlNetconfConstants.OK); } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Validate.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Validate.java index b8cae43643..24611c26cd 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Validate.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Validate.java @@ -98,7 +98,7 @@ public class Validate extends AbstractConfigNetconfOperation { } - logger.info("Datastore {} validated successfully", Datastore.candidate); + logger.trace("Datastore {} validated successfully", Datastore.candidate); return document.createElement(XmlNetconfConstants.OK); } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfig.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfig.java index 709573c241..a61d4633a2 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfig.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfig.java @@ -73,7 +73,7 @@ public class EditConfig extends AbstractConfigNetconfOperation { executeSet(configRegistryClient, editConfigExecution); } - logger.info("Operation {} successful", EditConfigXmlParser.EDIT_CONFIG); + logger.trace("Operation {} successful", EditConfigXmlParser.EDIT_CONFIG); return document.createElement(XmlNetconfConstants.OK); } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MissingInstanceHandlingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MissingInstanceHandlingStrategy.java index 8ed9eb8731..92e30f1617 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MissingInstanceHandlingStrategy.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MissingInstanceHandlingStrategy.java @@ -28,7 +28,7 @@ public class MissingInstanceHandlingStrategy extends AbstractEditConfigStrategy ObjectName on = null; try { on = ta.createModule(module, instance); - logger.info("New instance for {} {} created under name {}", module, instance, on); + logger.trace("New instance for {} {} created under name {}", module, instance, on); } catch (InstanceAlreadyExistsException e1) { throw new IllegalStateException("Unable to create instance for " + module + " : " + instance); } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/get/Get.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/get/Get.java index ea602091a0..dd9a0717b5 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/get/Get.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/get/Get.java @@ -153,7 +153,7 @@ public class Get extends AbstractConfigNetconfOperation { ConfigTransactionClient ta = configRegistryClient.getConfigTransactionClient(txOn); final Element element = runtime.toXml(runtimeBeans, configBeans, document, new ServiceRegistryWrapper(ta)); - logger.info("{} operation successful", XmlNetconfConstants.GET); + logger.trace("{} operation successful", XmlNetconfConstants.GET); return element; } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/getconfig/GetConfig.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/getconfig/GetConfig.java index 16dd5ad80a..297f78960b 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/getconfig/GetConfig.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/getconfig/GetConfig.java @@ -90,7 +90,7 @@ public class GetConfig extends AbstractConfigNetconfOperation { ServiceRegistryWrapper serviceTracker = new ServiceRegistryWrapper(ta); dataElement = configMapping.toXml(instances, this.maybeNamespace, document, dataElement, serviceTracker); - logger.info("{} operation successful", GET_CONFIG); + logger.trace("{} operation successful", GET_CONFIG); return dataElement; } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java index f838c6f9f5..e7f9772c01 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java @@ -173,7 +173,7 @@ public class RuntimeRpc extends AbstractConfigNetconfOperation { final Object result = executeOperation(configRegistryClient, execution.on, execution.operationName, execution.attributes); - logger.info("Operation {} called successfully on {} with arguments {} with result {}", execution.operationName, + logger.trace("Operation {} called successfully on {} with arguments {} with result {}", execution.operationName, execution.on, execution.attributes, result); if (execution.isVoid()) { diff --git a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java index b66a1a57c2..889fa8428c 100644 --- a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java +++ b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java @@ -69,7 +69,7 @@ public class ConfigPersisterNotificationHandler implements NotificationListener, // Socket should not be closed at this point // Activator unregisters this as JMX listener before close is called - logger.info("Received notification {}", notification); + logger.trace("Received notification {}", notification); if (notification instanceof CommitJMXNotification) { try { handleAfterCommitNotification((CommitJMXNotification) notification); @@ -87,7 +87,7 @@ public class ConfigPersisterNotificationHandler implements NotificationListener, try { persisterAggregator.persistConfig(new CapabilityStrippingConfigSnapshotHolder(notification.getConfigSnapshot(), notification.getCapabilities(), ignoredMissingCapabilityRegex)); - logger.info("Configuration persisted successfully"); + logger.trace("Configuration persisted successfully"); } catch (IOException e) { throw new RuntimeException("Unable to persist configuration snapshot", e); } diff --git a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusher.java b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusher.java index a47d6dd842..17a2ced30a 100644 --- a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusher.java +++ b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusher.java @@ -148,7 +148,7 @@ public class ConfigPusher { latestCapabilities = netconfClient.getCapabilities(); if (Util.isSubset(netconfClient, expectedCaps)) { logger.debug("Hello from netconf stable with {} capabilities", latestCapabilities); - logger.info("Session id received from netconf server: {}", netconfClient.getClientSession()); + logger.trace("Session id received from netconf server: {}", netconfClient.getClientSession()); return netconfClient; } logger.debug("Polling hello from netconf, attempt {}, capabilities {}", attempt, latestCapabilities); @@ -167,7 +167,7 @@ public class ConfigPusher { throws ConflictingVersionException, IOException, SAXException { Element xmlToBePersisted = XmlUtil.readXmlToElement(configSnapshotHolder.getConfigSnapshot()); - logger.info("Pushing last configuration to netconf: {}", configSnapshotHolder); + logger.trace("Pushing last configuration to netconf: {}", configSnapshotHolder); StringBuilder response = new StringBuilder("editConfig response = {"); NetconfMessage message = createEditConfigMessage(xmlToBePersisted, "/netconfOp/editConfig.xml"); @@ -186,7 +186,7 @@ public class ConfigPusher { response.append("commit response = {"); response.append(XmlUtil.toString(responseMessage.getDocument())); response.append("}"); - logger.info("Last configuration loaded successfully"); + logger.trace("Last configuration loaded successfully"); logger.trace("Detailed message {}", response); } diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultGetSchema.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultGetSchema.java index ba9e4d0f8a..f34529d53f 100644 --- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultGetSchema.java +++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultGetSchema.java @@ -95,7 +95,7 @@ public final class DefaultGetSchema extends AbstractNetconfOperation implements XmlUtil.addNamespaceAttr(getSchemaResult, XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_YANG_IETF_NETCONF_MONITORING); - logger.info("{} operation successful", GET_SCHEMA); + logger.trace("{} operation successful", GET_SCHEMA); return getSchemaResult; } diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultStartExi.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultStartExi.java index 9e84be6c31..679e280ba2 100644 --- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultStartExi.java +++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultStartExi.java @@ -73,7 +73,7 @@ public class DefaultStartExi extends AbstractNetconfOperation implements Default .createElement(XmlNetconfConstants.RPC_ERROR); } - logger.info("{} operation successful", START_EXI); + logger.trace("{} operation successful", START_EXI); logger.debug("received start-exi message {} ", XmlUtil.toString(document)); return getSchemaResult; diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultStopExi.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultStopExi.java index 2c6c89617f..d841a6619e 100644 --- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultStopExi.java +++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultStopExi.java @@ -57,7 +57,7 @@ public class DefaultStopExi extends AbstractNetconfOperation implements DefaultN Element getSchemaResult = document.createElement(XmlNetconfConstants.OK); XmlUtil.addNamespaceAttr(getSchemaResult, XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0); - logger.info("{} operation successful", STOP_EXI); + logger.trace("{} operation successful", STOP_EXI); logger.debug("received stop-exi message {} ", XmlUtil.toString(document)); return getSchemaResult; } diff --git a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/osgi/NetconfSSHActivator.java b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/osgi/NetconfSSHActivator.java index 8b3c5d70ad..91624007d0 100644 --- a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/osgi/NetconfSSHActivator.java +++ b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/osgi/NetconfSSHActivator.java @@ -43,7 +43,7 @@ public class NetconfSSHActivator implements BundleActivator{ ServiceTrackerCustomizer customizer = new ServiceTrackerCustomizer(){ @Override public IUserManager addingService(ServiceReference reference) { - logger.info("Service {} added, let there be SSH bridge.", reference); + logger.trace("Service {} added, let there be SSH bridge.", reference); iUserManager = context.getService(reference); try { onUserManagerFound(iUserManager); @@ -54,12 +54,12 @@ public class NetconfSSHActivator implements BundleActivator{ } @Override public void modifiedService(ServiceReference reference, IUserManager service) { - logger.info("Replacing modified service {} in netconf SSH.", reference); + logger.trace("Replacing modified service {} in netconf SSH.", reference); server.addUserManagerService(service); } @Override public void removedService(ServiceReference reference, IUserManager service) { - logger.info("Removing service {} from netconf SSH. " + + logger.trace("Removing service {} from netconf SSH. " + "SSH won't authenticate users until IUserManeger service will be started.", reference); removeUserManagerService(); } diff --git a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java index d159f59f1a..d1b5213f6e 100644 --- a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java +++ b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/threads/SocketThread.java @@ -194,7 +194,7 @@ public class SocketThread implements Runnable, ServerAuthenticationCallback, Ser return AuthenticationResult.SUCCESS; } } catch (Exception e){ - logger.info("Authentication failed due to :" + e.getLocalizedMessage()); + logger.warn("Authentication failed due to :" + e.getLocalizedMessage()); } return AuthenticationResult.FAILURE; } diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/messages/SendErrorExceptionUtil.java b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/messages/SendErrorExceptionUtil.java index a43216917b..6dc00bb150 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/messages/SendErrorExceptionUtil.java +++ b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/messages/SendErrorExceptionUtil.java @@ -34,13 +34,13 @@ public class SendErrorExceptionUtil { public static void sendErrorMessage(final NetconfSession session, final NetconfDocumentedException sendErrorException) { - logger.info("Sending error {}", sendErrorException.getMessage(), sendErrorException); + logger.trace("Sending error {}", sendErrorException.getMessage(), sendErrorException); final Document errorDocument = createDocument(sendErrorException); session.sendMessage(new NetconfMessage(errorDocument)); } public static void sendErrorMessage(Channel channel, NetconfDocumentedException sendErrorException) { - logger.info("Sending error {}", sendErrorException.getMessage(), sendErrorException); + logger.trace("Sending error {}", sendErrorException.getMessage(), sendErrorException); final Document errorDocument = createDocument(sendErrorException); channel.writeAndFlush(new NetconfMessage(errorDocument)); } @@ -48,7 +48,7 @@ public class SendErrorExceptionUtil { public static void sendErrorMessage(NetconfSession session, NetconfDocumentedException sendErrorException, NetconfMessage incommingMessage) { final Document errorDocument = createDocument(sendErrorException); - logger.info("Sending error {}", XmlUtil.toString(errorDocument)); + logger.trace("Sending error {}", XmlUtil.toString(errorDocument)); tryToCopyAttributes(incommingMessage.getDocument(), errorDocument, sendErrorException); session.sendMessage(new NetconfMessage(errorDocument)); } diff --git a/opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanner.java b/opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanner.java index 0c64082059..c590da4dbc 100644 --- a/opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanner.java +++ b/opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanner.java @@ -313,7 +313,7 @@ import org.slf4j.LoggerFactory; } } if (conflictsMsg.length() > 0) { - LOGGER.info("JAXB type conflicts detected : {}", conflictsMsg.toString()); + LOGGER.warn("JAXB type conflicts detected : {}", conflictsMsg.toString()); } } diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/utils/NorthboundUtils.java b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/utils/NorthboundUtils.java index bf8844d9f6..58ba776970 100644 --- a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/utils/NorthboundUtils.java +++ b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/utils/NorthboundUtils.java @@ -135,7 +135,7 @@ public class NorthboundUtils { } else { auditMsg = "Mode: " + mode + " User " + user + " " + action + " " + moduleName + " " + resource; } - logger.info(auditMsg); + logger.trace(auditMsg); } public static void auditlog(String moduleName, String user, String action, String resource) { diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java index 70c5072076..47461f4722 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java @@ -150,7 +150,7 @@ public class ControllerIO { } else { if (!currentlyUp) { // only generate log if the interface changes from down to up - logger.info("Interface {} with address {} is UP!", + logger.trace("Interface {} with address {} is UP!", netInt.getDisplayName(), controllerIP.getHostAddress()); } diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java index 811135252d..394be07dee 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java @@ -412,7 +412,7 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa List optionalTLVList = lldp.getOptionalTLVList(); if (optionalTLVList == null) { - logger.info("The discovery packet with null custom option from {}", dstNodeConnector); + logger.warn("The discovery packet with null custom option from {}", dstNodeConnector); return false; } diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowConverter.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowConverter.java index 361f977b2c..78a2ea5120 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowConverter.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowConverter.java @@ -423,7 +423,7 @@ public class FlowConverter { continue; } if (action.getType() == ActionType.SET_NEXT_HOP) { - logger.info("Unsupported action: {}", action); + logger.warn("Unsupported action: {}", action); continue; } } diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/OFStatisticsManager.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/OFStatisticsManager.java index 27a7ae6ffb..e5883d6717 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/OFStatisticsManager.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/OFStatisticsManager.java @@ -431,7 +431,7 @@ public class OFStatisticsManager implements IOFStatisticsManager, IInventoryShim } private void printInfoMessage(String type, StatsRequest request) { - log.info("{} stats request not inserted for switch: {}. Queue size: {}. Collector state: {}.", + log.trace("{} stats request not inserted for switch: {}. Queue size: {}. Collector state: {}.", new Object[] {type, HexString.toHexString(request.switchId), pendingStatsRequests.size(), statisticsCollector.getState().toString() }); } diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java index ff91e93f58..77d03aa122 100644 --- a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java +++ b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java @@ -91,23 +91,23 @@ public class ConfigManager implements IConfigManager{ } public VIP getVIPWithPoolName(VIP vip){ - cmLogger.info("Search a VIP with name:{}",vip); + cmLogger.trace("Search a VIP with name:{}",vip); for(VIP vipTemp: this.vips.values()){ if(vipTemp.equals(vip)){ - cmLogger.info("Found VIP with pool detail : {}",vipTemp); + cmLogger.trace("Found VIP with pool detail : {}",vipTemp); return vipTemp; } } - cmLogger.info("VIP with pool detail not found "); + cmLogger.trace("VIP with pool detail not found "); return null; } @Override public VIP createVIP(String name,String ip,String protocol,short protocolPort,String poolName){ - cmLogger.info("Create VIP with the following details :[ name : "+name + cmLogger.trace("Create VIP with the following details :[ name : "+name +" ip : "+ip +" protocol : "+protocol +" protocol_port : "+protocolPort @@ -124,7 +124,7 @@ public class ConfigManager implements IConfigManager{ vip.setStatus(LBConst.STATUS_ACTIVE); this.vips.put(name, vip); - cmLogger.info("New VIP created : "+vip.toString()); + cmLogger.trace("New VIP created : "+vip.toString()); return vip; } @@ -136,7 +136,7 @@ public class ConfigManager implements IConfigManager{ @Override public VIP updateVIP(String name, String poolName){ - cmLogger.info("Updating VIP : "+name+" pool name to "+poolName); + cmLogger.trace("Updating VIP : "+name+" pool name to "+poolName); if(vips.containsKey(name)){ VIP vip = vips.get(name); @@ -154,7 +154,7 @@ public class ConfigManager implements IConfigManager{ @Override public VIP deleteVIP(String name){ - cmLogger.info("Deleting VIP : "+name); + cmLogger.trace("Deleting VIP : "+name); VIP vip = vips.get(name); @@ -167,7 +167,7 @@ public class ConfigManager implements IConfigManager{ } } - cmLogger.info("VIP removed : "+vip.toString()); + cmLogger.trace("VIP removed : "+vip.toString()); vips.remove(vip.getName()); @@ -196,7 +196,7 @@ public class ConfigManager implements IConfigManager{ PoolMember pm = new PoolMember(name,memberIP,poolName); - cmLogger.info("Adding pool member : "+pm.toString()); + cmLogger.trace("Adding pool member : "+pm.toString()); pools.get(poolName).addMember(pm); @@ -206,7 +206,7 @@ public class ConfigManager implements IConfigManager{ @Override public PoolMember removePoolMember(String name, String poolName){ - cmLogger.info("Removing pool member : {} from pool {}",name, poolName); + cmLogger.trace("Removing pool member : {} from pool {}",name, poolName); Pool pool = pools.get(poolName); @@ -214,7 +214,7 @@ public class ConfigManager implements IConfigManager{ pool.removeMember(name); - cmLogger.info("Pool member {} removed from {} ",name,poolName); + cmLogger.trace("Pool member {} removed from {} ",name,poolName); return pm; } @@ -240,7 +240,7 @@ public class ConfigManager implements IConfigManager{ Pool newPool = new Pool(name,lbMethod); - cmLogger.info("New pool created : " + newPool.toString()); + cmLogger.trace("New pool created : " + newPool.toString()); pools.put(name, newPool); @@ -258,7 +258,7 @@ public class ConfigManager implements IConfigManager{ } - cmLogger.info("Pool removed : "+pool.toString()); + cmLogger.trace("Pool removed : "+pool.toString()); pools.remove(poolName); diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBUtil.java b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBUtil.java index aa195a34e9..729a49ba5c 100644 --- a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBUtil.java +++ b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBUtil.java @@ -35,17 +35,17 @@ public class LBUtil { * @return Details of the source machine in Client object. */ public Client getClientFromPacket(IPv4 inPkt){ - lbuLogger.info("Find client information from packet : {}",inPkt.toString()); + lbuLogger.trace("Find client information from packet : {}",inPkt.toString()); String ip = NetUtils.getInetAddress(inPkt.getSourceAddress()).getHostAddress(); String protocol = IPProtocols.getProtocolName(inPkt.getProtocol()); - lbuLogger.info("client ip {} and protocl {}",ip,protocol); + lbuLogger.trace("client ip {} and protocl {}",ip,protocol); Packet tpFrame= inPkt.getPayload(); - lbuLogger.info("Get protocol layer {}",tpFrame.toString()); + lbuLogger.trace("Get protocol layer {}",tpFrame.toString()); short port = 0; @@ -57,11 +57,11 @@ public class LBUtil { port = udpFrame.getSourcePort(); } - lbuLogger.info("Found port {}",port); + lbuLogger.trace("Found port {}",port); Client source = new Client(ip, protocol,port); - lbuLogger.info("Client information : {}",source.toString()); + lbuLogger.trace("Client information : {}",source.toString()); return source; } @@ -74,7 +74,7 @@ public class LBUtil { */ public VIP getVIPFromPacket(IPv4 inPkt){ - lbuLogger.info("Find VIP information from packet : {}",inPkt.toString()); + lbuLogger.trace("Find VIP information from packet : {}",inPkt.toString()); String ip = NetUtils.getInetAddress(inPkt.getDestinationAddress()).getHostAddress(); @@ -95,7 +95,7 @@ public class LBUtil { VIP dest = new VIP(null,ip, protocol,port,null); - lbuLogger.info("VIP information : {}",dest.toString()); + lbuLogger.trace("VIP information : {}",dest.toString()); return dest; } diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java index b2229cb022..e1a997b44c 100644 --- a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java +++ b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java @@ -268,14 +268,14 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager { forwardPort = hnConnector.getnodeConnector(); lbsLogger - .info("Both source (client) and destination pool machine is connected to same switch nodes. Respective ports are - {},{}", + .trace("Both source (client) and destination pool machine is connected to same switch nodes. Respective ports are - {},{}", forwardPort, inPkt.getIncomingNodeConnector()); } else { Path route = this.routing.getRoute(clientNode, destNode); - lbsLogger.info("Path between source (client) and destination switch nodes : {}", + lbsLogger.trace("Path between source (client) and destination switch nodes : {}", route.toString()); forwardPort = route.getEdges().get(0).getTailNodeConnector(); @@ -285,7 +285,7 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager { if (installLoadBalancerFlow(client, vip, clientNode, poolMemberIp, hnConnector.getDataLayerAddressBytes(), forwardPort, LBConst.FORWARD_DIRECTION_LB_FLOW)) { - lbsLogger.info("Traffic from client : {} will be routed " + "to pool machine : {}", + lbsLogger.trace("Traffic from client : {} will be routed " + "to pool machine : {}", client, poolMemberIp); } else { lbsLogger.error("Not able to route traffic from client : {}", client); @@ -293,7 +293,7 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager { if (installLoadBalancerFlow(client, vip, clientNode, poolMemberIp, vipMacAddr, inPkt.getIncomingNodeConnector(), LBConst.REVERSE_DIRECTION_LB_FLOW)) { - lbsLogger.info("Flow rule installed to change the source ip/mac from " + lbsLogger.trace("Flow rule installed to change the source ip/mac from " + "pool machine ip {} to VIP {} for traffic coming pool machine", poolMemberIp, vip); } else { @@ -389,7 +389,7 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager { FlowEntry fEntry = new FlowEntry(policyName, flowName, flow, sourceSwitch); - lbsLogger.info("Install flow entry {} on node {}", fEntry.toString(), sourceSwitch.toString()); + lbsLogger.trace("Install flow entry {} on node {}", fEntry.toString(), sourceSwitch.toString()); if (!this.ruleManager.checkFlowEntryConflict(fEntry)) { if (this.ruleManager.installFlowEntry(fEntry).isSuccess()) { @@ -413,13 +413,13 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager { if (props != null) { this.containerName = (String) props.get("containerName"); - lbsLogger.info("Running container name:" + this.containerName); + lbsLogger.trace("Running container name:" + this.containerName); } else { // In the Global instance case the containerName is empty this.containerName = ""; } - lbsLogger.info(configManager.toString()); + lbsLogger.trace(configManager.toString()); } diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RandomLBPolicy.java b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RandomLBPolicy.java index ba5d5babb6..c169d79799 100644 --- a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RandomLBPolicy.java +++ b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RandomLBPolicy.java @@ -57,7 +57,7 @@ public class RandomLBPolicy implements ILoadBalancingPolicy { @Override public String getPoolMemberForClient(Client source, VIP dest){ - rLogger.info("Received traffic from client : {} for VIP : {} ",source, dest); + rLogger.trace("Received traffic from client : {} for VIP : {} ",source, dest); syncWithLoadBalancerData(); @@ -65,14 +65,14 @@ public class RandomLBPolicy implements ILoadBalancingPolicy { if(this.clientMemberMap.containsKey(source)){ pm= this.clientMemberMap.get(source); - rLogger.info("Client {} had sent traffic before,new traffic will be routed to the same pool member {}",source,pm); + rLogger.trace("Client {} had sent traffic before,new traffic will be routed to the same pool member {}",source,pm); }else{ Pool pool = null; pool = this.cmgr.getPool(dest.getPoolName()); int memberNum = this.randomGenerator.nextInt(pool.getAllMembers().size()-1); pm = pool.getAllMembers().get(memberNum); this.clientMemberMap.put(source, pm ); - rLogger.info("Network traffic from client {} will be directed to pool member {}",pm); + rLogger.trace("Network traffic from client {} will be directed to pool member {}",pm); } return pm.getIp(); } diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RoundRobinLBPolicy.java b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RoundRobinLBPolicy.java index 1a473a7c04..492c7a9aa7 100644 --- a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RoundRobinLBPolicy.java +++ b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RoundRobinLBPolicy.java @@ -60,7 +60,7 @@ public class RoundRobinLBPolicy implements ILoadBalancingPolicy{ @Override public String getPoolMemberForClient(Client source, VIP dest){ - rrLogger.info("Received traffic from client : {} for VIP : {} ",source, dest); + rrLogger.trace("Received traffic from client : {} for VIP : {} ",source, dest); syncWithLoadBalancerData(); @@ -69,7 +69,7 @@ public class RoundRobinLBPolicy implements ILoadBalancingPolicy{ if(this.clientMemberMap.containsKey(source)){ pm= this.clientMemberMap.get(source); - rrLogger.info("Client {} had sent traffic before,new traffic will be routed to the same pool member {}",source,pm); + rrLogger.trace("Client {} had sent traffic before,new traffic will be routed to the same pool member {}",source,pm); }else{ Pool pool = null; @@ -80,7 +80,7 @@ public class RoundRobinLBPolicy implements ILoadBalancingPolicy{ pool = this.cmgr.getPool(dest.getPoolName()); pm = pool.getAllMembers().get(memberNum); this.clientMemberMap.put(source, pm ); - rrLogger.info("New client's packet will be directed to pool member {}",pm); + rrLogger.trace("New client's packet will be directed to pool member {}",pm); memberNum++; if(memberNum > pool.getAllMembers().size()-1){ @@ -95,7 +95,7 @@ public class RoundRobinLBPolicy implements ILoadBalancingPolicy{ pm = pool.getAllMembers().get(0); this.clientMemberMap.put(source, pm); - rrLogger.info("Network traffic from client {} will be directed to pool member {}",pm); + rrLogger.trace("Network traffic from client {} will be directed to pool member {}",pm); this.nextItemFromPool.put(dest, 1); rrLogger.debug("Next pool member for new client of VIP is set to {}",pool.getAllMembers().get(1)); } diff --git a/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java b/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java index 7a3625a229..4b3363b832 100644 --- a/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java +++ b/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java @@ -168,7 +168,7 @@ public class SimpleForwardingImpl implements IfNewHostNotify, private void allocateCaches() { if (this.clusterContainerService == null) { - log.info("un-initialized clusterContainerService, can't create cache"); + log.trace("un-initialized clusterContainerService, can't create cache"); return; } @@ -185,7 +185,7 @@ public class SimpleForwardingImpl implements IfNewHostNotify, @SuppressWarnings({ "unchecked" }) private void retrieveCaches() { if (this.clusterContainerService == null) { - log.info("un-initialized clusterContainerService, can't retrieve cache"); + log.trace("un-initialized clusterContainerService, can't retrieve cache"); return; } @@ -198,7 +198,7 @@ public class SimpleForwardingImpl implements IfNewHostNotify, private void destroyCaches() { if (this.clusterContainerService == null) { - log.info("un-initialized clusterContainerService, can't destroy cache"); + log.trace("un-initialized clusterContainerService, can't destroy cache"); return; } diff --git a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java b/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java index 4b186fc4a1..8808beefd7 100644 --- a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java +++ b/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java @@ -237,7 +237,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa @SuppressWarnings({ "unchecked" }) private void retrieveCaches() { if (this.clusterContainerService == null) { - log.info("un-initialized clusterContainerService, can't create cache"); + log.warn("un-initialized clusterContainerService, can't create cache"); return; } @@ -789,7 +789,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa return; } - log.info("Set Node {}'s Mode to {}", nodeId, cfgObject.getMode()); + log.trace("Set Node {}'s Mode to {}", nodeId, cfgObject.getMode()); if (modeChange) { notifyModeChange(node, cfgObject.isProactive()); diff --git a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java b/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java index 5d0cbb6286..5d673fbca4 100644 --- a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java +++ b/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java @@ -276,18 +276,18 @@ public class UserManager implements IUserManager, IObjectReader, rcResponse = aaaClient.authService(userName, password, aaaServer.getAddress(), aaaServer.getSecret()); if (rcResponse.getStatus() == AuthResultEnum.AUTH_ACCEPT) { - logger.info( + logger.trace( "Remote Authentication Succeeded for User: \"{}\", by Server: {}", userName, aaaServer.getAddress()); remotelyAuthenticated = true; break; } else if (rcResponse.getStatus() == AuthResultEnum.AUTH_REJECT) { - logger.info( + logger.trace( "Remote Authentication Rejected User: \"{}\", from Server: {}, Reason:{}", new Object[] { userName, aaaServer.getAddress(), rcResponse.getStatus().toString() }); } else { - logger.info( + logger.trace( "Remote Authentication Failed for User: \"{}\", from Server: {}, Reason:{}", new Object[] { userName, aaaServer.getAddress(), rcResponse.getStatus().toString() }); @@ -684,7 +684,7 @@ public class UserManager implements IUserManager, IObjectReader, // Trigger cluster update localUserConfigList.put(user, targetConfigEntry); - logger.info("Password changed for User \"{}\"", user); + logger.trace("Password changed for User \"{}\"", user); return status; } @@ -694,7 +694,7 @@ public class UserManager implements IUserManager, IObjectReader, // TODO: if user was authenticated through AAA server, send // Acct-Status-Type=stop message to server with logout as reason removeUserFromActiveList(userName); - logger.info("User \"{}\" logged out", userName); + logger.trace("User \"{}\" logged out", userName); } /* @@ -705,7 +705,7 @@ public class UserManager implements IUserManager, IObjectReader, // TODO: if user was authenticated through AAA server, send // Acct-Status-Type=stop message to server with timeout as reason removeUserFromActiveList(userName); - logger.info("User \"{}\" timed out", userName); + logger.trace("User \"{}\" timed out", userName); } @Override diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebUtil.java b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebUtil.java index 6f09577901..fb252bf95c 100644 --- a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebUtil.java +++ b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebUtil.java @@ -73,7 +73,7 @@ public class DaylightWebUtil { } else { auditMsg = "Mode: " + mode + " User " + user + " " + action + " " + moduleName + " " + resource; } - logger.info(auditMsg); + logger.trace(auditMsg); } public static void auditlog(String moduleName, String user, String action, String resource) {