X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-store-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyang%2Fstore%2Fimpl%2FExtenderYangTracker.java;h=889d246784a05bfa1dd425ff3a6e2daaa09a7f39;hp=74a36c553fe7237e1a7df4bc7dff24c18bc6b28b;hb=e1658face07c354aa8fd5b12da700401ce1efc37;hpb=dad78e1fc8a7c67fa4b88cf09d6a952443462feb 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 74a36c553f..889d246784 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 @@ -120,9 +120,9 @@ public class ExtenderYangTracker extends BundleTracker implements YangSt // inconsistent state inconsistentBundlesToYangURLs.putAll(bundle, addedURLs); - logger.debug("Yang store is falling back on last consistent state containing {}, inconsistent yang files {}", + logger.debug("Yang store is falling back to last consistent state containing {}, inconsistent yang files {}", consistentBundlesToYangURLs, inconsistentBundlesToYangURLs, failureReason); - logger.warn("Yang store is falling back on last consistent state containing {} files, inconsistent yang files size is {}, reason {}", + logger.info("Yang store is falling back to last consistent state containing {} files, keeping {} inconsistent yang files due to {}", consistentBundlesToYangURLs.size(), inconsistentBundlesToYangURLs.size(), failureReason.toString()); cache.setInconsistentURLsForReporting(inconsistentBundlesToYangURLs.values()); } @@ -132,12 +132,17 @@ public class ExtenderYangTracker extends BundleTracker implements YangSt // merge into consistentBundlesToYangURLs.clear(); consistentBundlesToYangURLs.putAll(proposedNewState); - inconsistentBundlesToYangURLs.clear(); + + logger.debug("Yang store updated to new consistent state containing {}", consistentBundlesToYangURLs); + + // If we cleared up some inconsistent models, report that + if (!inconsistentBundlesToYangURLs.isEmpty()) { + inconsistentBundlesToYangURLs.clear(); + logger.info("Yang store updated to new consistent state containing {} yang files", consistentBundlesToYangURLs.size()); + } updateCache(snapshot); cache.setInconsistentURLsForReporting(Collections. emptySet()); - 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); } private synchronized void updateCache(YangStoreSnapshotImpl snapshot) {