ESMockAPIBasedRepositoryIntegTestCase Executor Service

Author: albertzaharovits

test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java

@@ -22,7 +22,6 @@
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import org.apache.http.HttpStatus;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeResponse;
@@ -32,6 +31,8 @@
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.network.InetAddresses;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.util.concurrent.EsExecutors;
+import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.mocksocket.MockHttpServer;
 import org.elasticsearch.test.BackgroundIndexer;
 import org.junit.After;
@@ -46,6 +47,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -71,21 +75,16 @@ protected interface BlobStoreHttpHandler extends HttpHandler {
     private static final byte[] BUFFER = new byte[1024];
 
     private static HttpServer httpServer;
+    private static ExecutorService executorService;
     private Map<String, HttpHandler> handlers;
 
-    private static final Logger log = LogManager.getLogger();
-
     @BeforeClass
     public static void startHttpServer() throws Exception {
         httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
-        httpServer.setExecutor(r -> {
-            Thread runThread = new Thread(r);
-            runThread.setUncaughtExceptionHandler((t, e) -> {
-                log.error("Error in execution on mock http server IO thread", e);
-                Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(t, e);
-            });
-            runThread.start();
-        });
+        ThreadFactory threadFactory = EsExecutors.daemonThreadFactory("[" + ESMockAPIBasedRepositoryIntegTestCase.class.getName() + "]");
+        executorService = EsExecutors.newScaling(ESMockAPIBasedRepositoryIntegTestCase.class.getName(), 0, 2, 60, TimeUnit.SECONDS,
+                threadFactory, new ThreadContext(Settings.EMPTY));
+        httpServer.setExecutor(executorService);
         httpServer.start();
     }
 
@@ -98,6 +97,7 @@ public void setUpHttpServer() {
     @AfterClass
     public static void stopHttpServer() {
         httpServer.stop(0);
+        executorService.shutdown();
         httpServer = null;
     }
 

x-pack/plugin/repository-encrypted/src/main/java/org/elasticsearch/repositories/encrypted/EncryptedRepository.java

@@ -263,6 +263,8 @@ public void finalizeSnapshot(SnapshotId snapshotId, ShardGenerations shardGenera
                                  Version repositoryMetaVersion, ActionListener<SnapshotInfo> listener) {
         validateRepositoryPasswordHash(userMetadata, listener::onFailure);
         if (userMetadata != null && userMetadata.containsKey(PASSWORD_HASH_RESERVED_USER_METADATA_KEY)) {
+            // remove the repository password hash from the snapshot metadata, after all repository password verifications
+            // have completed, so that the hash is not displayed in the API response to the user
             userMetadata.remove(PASSWORD_HASH_RESERVED_USER_METADATA_KEY);
         }
         super.finalizeSnapshot(snapshotId, shardGenerations, startTime, failure, totalShards, shardFailures, repositoryStateId,

x-pack/plugin/repository-encrypted/src/main/java/org/elasticsearch/repositories/encrypted/EncryptedRepositoryPlugin.java

@@ -94,10 +94,13 @@ public Repository create(RepositoryMetaData metaData, Function<String, Repositor
                             " must not be equal to " + REPOSITORY_TYPE_NAME);
                 }
                 Repository.Factory factory = typeLookup.apply(delegateType);
+                if (null == factory) {
+                    throw new IllegalArgumentException("Unsupported delegate type " + DELEGATE_TYPE.getKey());
+                }
                 Repository delegatedRepository = factory.create(new RepositoryMetaData(metaData.name(),
                         delegateType, metaData.settings()));
                 if (false == (delegatedRepository instanceof BlobStoreRepository) || delegatedRepository instanceof EncryptedRepository) {
-                    throw new IllegalArgumentException("Unsupported type " + DELEGATE_TYPE.getKey());
+                    throw new IllegalArgumentException("Unsupported delegate type " + DELEGATE_TYPE.getKey());
                 }
                 final char[] repositoryPassword = cachedRepositoryPasswords.get(metaData.name());
                 if (repositoryPassword == null) {