commit f4fe8038fb9f901715f5bc48351606719ce6ec39
author David Pursehouse <dpursehouse@collab.net> Mon Dec 02 23:16:26 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 02 23:16:26 2019 +0000
tree 6b82a415e83e0bd93c139be382629937f381cec6
parent 89166c776648b942f407c2c6f63ac92d5db13541
parent 5a8cc6a7c3ac852d74d98ce6a94338596acaf390

Merge "ExternalIdCacheLoader: suppress warning if cache is not persisted." into stable-3.1

java/com/google/gerrit/server/account/externalids/ExternalIdCacheLoader.java

diff --git a/java/com/google/gerrit/server/account/externalids/ExternalIdCacheLoader.java b/java/com/google/gerrit/server/account/externalids/ExternalIdCacheLoader.java
index 25420ee..8887e06 100644
--- a/java/com/google/gerrit/server/account/externalids/ExternalIdCacheLoader.java
+++ b/java/com/google/gerrit/server/account/externalids/ExternalIdCacheLoader.java
@@ -71,6 +71,7 @@
   private final Counter1<Boolean> reloadCounter;
   private final Timer0 reloadDifferential;
   private final boolean enablePartialReloads;
+  private final boolean isPersistentCache;
 
   @Inject
   ExternalIdCacheLoader(
@@ -101,6 +102,8 @@
                 .setUnit(Units.MILLISECONDS));
     this.enablePartialReloads =
         config.getBoolean("cache", ExternalIdCacheImpl.CACHE_NAME, "enablePartialReloads", true);
+    this.isPersistentCache =
+        config.getInt("cache", ExternalIdCacheImpl.CACHE_NAME, "diskLimit", 0) > 0;
   }
 
   @Override
@@ -156,8 +159,11 @@
         }
       }
       if (oldExternalIds == null) {
-        logger.atWarning().log(
-            "Unable to find an old ExternalId cache state, falling back to full reload");
+        if (isPersistentCache) {
+          // If there is no persistence, this is normal. Don't upset admins reading the logs.
+          logger.atWarning().log(
+              "Unable to find an old ExternalId cache state, falling back to full reload");
+        }
         return reloadAllExternalIds(notesRev);
       }