You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/12/01 17:10:19 UTC
[31/32] lucene-solr:jira/http2: Merge with master
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6c6fd559/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
----------------------------------------------------------------------
diff --cc solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
index 3709242,454681c..23dfc3a
--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
@@@ -77,22 -77,22 +77,22 @@@ abstract public class SolrJettyTestBas
nodeProps.setProperty("solr.data.dir", createTempDir().toFile().getCanonicalPath());
}
- return createJetty(solrHome, nodeProps, jettyConfig);
+ return createAndStartJetty(solrHome, nodeProps, jettyConfig);
}
- public static JettySolrRunner createJetty(String solrHome, String configFile, String context) throws Exception {
- return createJetty(solrHome, configFile, null, context, true, null);
+ public static JettySolrRunner createAndStartJetty(String solrHome, String configFile, String context) throws Exception {
+ return createAndStartJetty(solrHome, configFile, null, context, true, null);
}
- public static JettySolrRunner createJetty(String solrHome, JettyConfig jettyConfig) throws Exception {
- return createJetty(solrHome, new Properties(), jettyConfig);
+ public static JettySolrRunner createAndStartJetty(String solrHome, JettyConfig jettyConfig) throws Exception {
+ return createAndStartJetty(solrHome, new Properties(), jettyConfig);
}
- public static JettySolrRunner createJetty(String solrHome) throws Exception {
- return createJetty(solrHome, new Properties(), JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build());
+ public static JettySolrRunner createAndStartJetty(String solrHome) throws Exception {
- return createAndStartJetty(solrHome, new Properties(), JettyConfig.builder().withSSLConfig(sslConfig).build());
++ return createAndStartJetty(solrHome, new Properties(), JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build());
}
- public static JettySolrRunner createJetty(String solrHome, Properties nodeProperties, JettyConfig jettyConfig) throws Exception {
+ public static JettySolrRunner createAndStartJetty(String solrHome, Properties nodeProperties, JettyConfig jettyConfig) throws Exception {
initCore(null, null, solrHome);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6c6fd559/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --cc solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 059b76b,13d7f22..eec9524
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@@ -194,14 -195,9 +198,16 @@@ public abstract class SolrTestCaseJ4 ex
public static int DEFAULT_CONNECTION_TIMEOUT = 60000; // default socket connection timeout in ms
private static String initialRootLogLevel;
+
+ protected volatile static ExecutorService testExecutor;
+ static {
+ // Set Conscrypt as default OpenSSLProvider for all clients
+ if (Security.getProvider("Conscrypt") == null) {
+ Security.insertProviderAt(new OpenSSLProvider(), 1);
+ }
+ }
+
protected void writeCoreProperties(Path coreDirectory, String corename) throws IOException {
Properties props = new Properties();
props.setProperty("name", corename);
@@@ -332,11 -333,11 +344,12 @@@
System.clearProperty("urlScheme");
System.clearProperty("solr.peerSync.useRangeVersions");
System.clearProperty("solr.cloud.wait-for-updates-with-stale-state-pause");
+ System.clearProperty("solr.zkclienttmeout");
HttpClientUtil.resetHttpClientBuilder();
+ Http2SolrClient.resetSslContextFactory();
clearNumericTypesProperties();
-
+
// clean up static
sslConfig = null;
testSolrHome = null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6c6fd559/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
----------------------------------------------------------------------
diff --cc solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
index fd70a7c,7df3345..d98a1e0
--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
@@@ -501,30 -620,6 +620,30 @@@ public abstract class AbstractFullDistr
return cnt;
}
+ public JettySolrRunner createJetty(String dataDir, String ulogDir, String shardList,
+ String solrConfigOverride) throws Exception {
+
+ JettyConfig jettyconfig = JettyConfig.builder()
+ .setContext(context)
+ .stopAtShutdown(false)
+ .withServlets(getExtraServlets())
+ .withFilters(getExtraRequestFilters())
+ .withSSLConfig(sslConfig.buildServerSSLConfig())
+ .build();
+
+ Properties props = new Properties();
+ props.setProperty("solr.data.dir", getDataDir(dataDir));
+ props.setProperty("shards", shardList);
+ props.setProperty("solr.ulog.dir", ulogDir);
+ props.setProperty("solrconfig", solrConfigOverride);
+
+ JettySolrRunner jetty = new JettySolrRunner(getSolrHome(), props, jettyconfig);
+
+ jetty.start();
+
+ return jetty;
+ }
-
++
public final JettySolrRunner createJetty(File solrHome, String dataDir, String shardList, String solrConfigOverride, String schemaOverride) throws Exception {
return createJetty(solrHome, dataDir, shardList, solrConfigOverride, schemaOverride, null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6c6fd559/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java
----------------------------------------------------------------------
diff --cc solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java
index 8b440a2,82aba1b..f4dfcee
--- a/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java
+++ b/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java
@@@ -82,47 -83,52 +83,10 @@@ public class TrackingShardHandlerFactor
@Override
public ShardHandler getShardHandler() {
- final ShardHandlerFactory factory = this;
- final ShardHandler wrapped = super.getShardHandler();
- return new ShardHandler() {
- @Override
- public void prepDistributed(ResponseBuilder rb) {
- wrapped.prepDistributed(rb);
- }
-
- @Override
- public void submit(ShardRequest sreq, String shard, ModifiableSolrParams params) {
- synchronized (TrackingShardHandlerFactory.this) {
- if (isTracking()) {
- queue.offer(new ShardRequestAndParams(sreq, shard, params));
- }
- }
- wrapped.submit(sreq, shard, params);
- }
-
- @Override
- public ShardResponse takeCompletedIncludingErrors() {
- return wrapped.takeCompletedIncludingErrors();
- }
-
- @Override
- public ShardResponse takeCompletedOrError() {
- return wrapped.takeCompletedOrError();
- }
-
- @Override
- public void cancelAll() {
- wrapped.cancelAll();
- }
-
- @Override
- public ShardHandlerFactory getShardHandlerFactory() {
- return factory;
- }
- };
+ return super.getShardHandler();
}
-
+
@Override
- public ShardHandler getShardHandler(HttpClient client) {
- final ShardHandlerFactory factory = this;
- final ShardHandler wrapped = super.getShardHandler(client);
- return new HttpShardHandler(this, client) {
- @Override
- public void prepDistributed(ResponseBuilder rb) {
- wrapped.prepDistributed(rb);
- }
-
- @Override
- public void submit(ShardRequest sreq, String shard, ModifiableSolrParams params) {
- synchronized (TrackingShardHandlerFactory.this) {
- if (isTracking()) {
- queue.offer(new ShardRequestAndParams(sreq, shard, params));
- }
- }
- wrapped.submit(sreq, shard, params);
- }
-
- @Override
- public ShardResponse takeCompletedIncludingErrors() {
- return wrapped.takeCompletedIncludingErrors();
- }
-
- @Override
- public ShardResponse takeCompletedOrError() {
- return wrapped.takeCompletedOrError();
- }
-
- @Override
- public void cancelAll() {
- wrapped.cancelAll();
- }
-
- @Override
- public ShardHandlerFactory getShardHandlerFactory() {
- return factory;
- }
- };
- }
-
- @Override
public void close() {
super.close();
}