fixup!

Author: jfreden

server/src/test/java/org/elasticsearch/plugins/internal/ReloadAwarePluginTests.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.plugins.internal;
 
+import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.node.MockNode;
 import org.elasticsearch.plugins.Plugin;
@@ -57,20 +58,26 @@ public void setReloadCallback(ReloadablePlugin reloadablePlugin) {
 
         public void invokeReloadOperation() throws Exception {
             reloadablePlugin.reload(Settings.EMPTY);
+            reloadablePlugin.reload(randomUniqueProjectId(), Settings.EMPTY);
         }
     }
 
     public static class TestReloadablePlugin extends Plugin implements ReloadablePlugin {
 
-        private boolean reloaded = false;
+        private int reloadCount = 0;
 
         @Override
         public void reload(Settings settings) throws Exception {
-            reloaded = true;
+            reloadCount++;
+        }
+
+        @Override
+        public void reload(ProjectId projectId, Settings settings) throws Exception {
+            reloadCount++;
         }
 
         public boolean isReloaded() {
-            return reloaded;
+            return reloadCount >= 2;
         }
     }
 }

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CachingUsernamePasswordRealm.java

@@ -36,15 +36,15 @@ public abstract class CachingUsernamePasswordRealm extends UsernamePasswordRealm
     private final UserAuthenticationCache cache;
     private final ThreadPool threadPool;
     private final boolean authenticationEnabled;
-    protected final Hasher credentialHasher;
+    protected final Hasher cacheHasher;
 
     protected CachingUsernamePasswordRealm(RealmConfig config, ThreadPool threadPool) {
         this(config, threadPool, buildDefaultCache(config));
     }
 
     protected CachingUsernamePasswordRealm(RealmConfig config, ThreadPool threadPool, UserAuthenticationCache cache) {
         super(config);
-        credentialHasher = Hasher.resolve(this.config.getSetting(CachingUsernamePasswordRealmSettings.CACHE_HASH_ALGO_SETTING));
+        cacheHasher = Hasher.resolve(this.config.getSetting(CachingUsernamePasswordRealmSettings.CACHE_HASH_ALGO_SETTING));
         this.threadPool = threadPool;
         this.authenticationEnabled = config.getSetting(CachingUsernamePasswordRealmSettings.AUTHC_ENABLED_SETTING);
         this.cache = cache;
@@ -255,9 +255,7 @@ private void authenticateWithCache(UsernamePasswordToken token, ActionListener<A
                     // notify any forestalled request listeners; they will not reach to the
                     // authentication request and instead will use this result if they contain
                     // the same credentials
-                    listenableCacheEntry.onResponse(
-                        new CachedResult(authResult, credentialHasher, authResult.getValue(), token.credentials())
-                    );
+                    listenableCacheEntry.onResponse(new CachedResult(authResult, cacheHasher, authResult.getValue(), token.credentials()));
                     listener.onResponse(authResult);
                 }, e -> {
                     cache.invalidate(token.principal(), listenableCacheEntry);
@@ -322,7 +320,7 @@ private void lookupWithCache(String username, ActionListener<User> listener) {
             if (false == lookupInCache.get()) {
                 // attempt lookup against the user directory
                 doLookupUser(username, ActionListener.wrap(user -> {
-                    final CachedResult result = new CachedResult(AuthenticationResult.notHandled(), credentialHasher, user, null);
+                    final CachedResult result = new CachedResult(AuthenticationResult.notHandled(), cacheHasher, user, null);
                     if (user == null) {
                         // user not found, invalidate cache so that subsequent requests are forwarded to
                         // the user directory

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/support/CachingUsernamePasswordRealmTests.java

@@ -102,7 +102,7 @@ protected void doLookupUser(String username, ActionListener<User> listener) {
                 listener.onFailure(new UnsupportedOperationException("this method should not be called"));
             }
         };
-        assertThat(realm.credentialHasher, sameInstance(Hasher.resolve(cachingHashAlgo)));
+        assertThat(realm.cacheHasher, sameInstance(Hasher.resolve(cachingHashAlgo)));
     }
 
     public void testCacheSizeWhenCacheDisabled() {