You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/11/15 03:33:24 UTC
[lucene-solr] branch reference_impl_dev updated (cf9bc29 -> 30b339b)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from cf9bc29 @1205 Start working out rare issues where tests can fail with a null updatelog and should have one.
new 030cf22 @1206 Bridge tests can still hit a no update log configured - try this.
new 12f6951 @1207 Test debug config.
new 30b339b @1208 Add tlog def.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/solr/cloud/SolrCloudBridgeTestCase.java | 18 ++++++++++--------
.../org/apache/solr/common/cloud/SolrZkClient.java | 11 ++++++-----
.../solrj/solr/configsets/spatial/conf/solrconfig.xml | 2 +-
3 files changed, 17 insertions(+), 14 deletions(-)
[lucene-solr] 03/03: @1208 Add tlog def.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 30b339b924709c2a2d193e01315a8385533e40aa
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Nov 14 21:32:57 2020 -0600
@1208 Add tlog def.
---
.../org/apache/solr/cloud/SolrCloudBridgeTestCase.java | 16 +++++++---------
.../solrj/solr/configsets/spatial/conf/solrconfig.xml | 2 +-
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
index de430cf..c4826f2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
@@ -84,7 +84,7 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
protected static String COLLECTION = "collection1";
protected static String DEFAULT_COLLECTION = COLLECTION;
- protected static CloudHttp2SolrClient cloudClient;
+ protected volatile static CloudHttp2SolrClient cloudClient;
protected static final String SHARD1 = "s1";
@@ -113,13 +113,13 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
protected static String[] fieldNames = new String[]{"n_ti1", "n_f1", "n_tf1", "n_d1", "n_td1", "n_l1", "n_tl1", "n_dt1", "n_tdt1"};
- protected static int numJettys = 3;
+ protected volatile static int numJettys = 3;
- protected static int sliceCount = 2;
+ protected volatile static int sliceCount = 2;
- protected static int replicationFactor = 1;
+ protected volatile static int replicationFactor = 1;
- protected static boolean enableProxy = false;
+ protected volatile static boolean enableProxy = false;
protected final List<SolrClient> clients = Collections.synchronizedList(new ArrayList<>());
protected volatile static boolean createCollection1 = true;
@@ -134,15 +134,13 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
protected volatile static SortedMap<ServletHolder, String> extraServlets = Collections.emptySortedMap();
- Pattern filenameExclusions = Pattern.compile(".*solrconfig(?:-|_).*?\\.xml|.*schema(?:-|_).*?\\.xml");
+ final Pattern filenameExclusions = Pattern.compile(".*solrconfig(?:-|_).*?\\.xml|.*schema(?:-|_).*?\\.xml");
public static Path TEST_PATH() { return SolrTestCaseJ4.getFile("solr/collection1").getParentFile().toPath(); }
@Before
public void beforeSolrCloudBridgeTestCase() throws Exception {
-
-
-
+
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml
index 4d6da78..78aa397 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml
@@ -48,7 +48,7 @@
<commitWithin>
<softCommit>${solr.commitwithin.softcommit:true}</softCommit>
</commitWithin>
-
+ <updateLog class="${solr.ulog:solr.UpdateLog}"></updateLog>
</updateHandler>
<requestHandler name="/select" class="solr.SearchHandler">
<lst name="defaults">
[lucene-solr] 01/03: @1206 Bridge tests can still hit a no update
log configured - try this.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 030cf22ce3c828259fbfc06d381037ea4324b15f
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Nov 14 21:20:01 2020 -0600
@1206 Bridge tests can still hit a no update log configured - try this.
---
.../src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
index 1a95e1f..de430cf 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
@@ -141,11 +141,15 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
@Before
public void beforeSolrCloudBridgeTestCase() throws Exception {
+
+
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
cluster = configureCluster(numJettys).formatZk(formatZk).withSolrXml(TEST_PATH().resolve(solrxmlString)).withJettyConfig(jettyCfg -> jettyCfg.withServlets(extraServlets).enableProxy(enableProxy)).build();
-
+
+ cluster.getZkClient().clean("/configs/_default");
+
SolrZkClient zkClient = cluster.getZkClient();
if (!zkClient.exists("/configs/_default")) {
[lucene-solr] 02/03: @1207 Test debug config.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 12f6951a6a237fbbeb0532675e8fdfff07c50d0f
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Nov 14 21:26:00 2020 -0600
@1207 Test debug config.
---
.../src/java/org/apache/solr/common/cloud/SolrZkClient.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
index 4bf892b..faf382d 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
@@ -950,11 +950,12 @@ public class SolrZkClient implements Closeable {
string.append(dent).append(path).append(" (c=").append(children.size()).append(",v=" + (stat == null ? "?" : stat.getVersion()) + ")").append(NEWL);
if (data != null) {
String dataString = new String(data, StandardCharsets.UTF_8);
- if ((stat != null && stat.getDataLength() < MAX_BYTES_FOR_ZK_LAYOUT_DATA_SHOW && dataString.split("\\r\\n|\\r|\\n").length < 6) || path.endsWith("state.json")) {
- if (path.endsWith(".xml")) {
- // this is the cluster state in xml format - lets pretty print
- dataString = prettyPrint(path, dataString);
- }
+ if ((stat != null && stat.getDataLength() < MAX_BYTES_FOR_ZK_LAYOUT_DATA_SHOW && dataString.split("\\r\\n|\\r|\\n").length < 6) || path.endsWith("state.json")
+ || (path.endsWith("solrconfig.xml") && Boolean.getBoolean("solr.tests.printsolrconfig"))) {
+// if (path.endsWith(".xml")) {
+// // this is the cluster state in xml format - lets pretty print
+// dataString = prettyPrint(path, dataString);
+// }
string.append(dent).append("DATA (" + (stat != null ? stat.getDataLength() : "?") + "b) :\n").append(dent).append(" ")
.append(dataString.replaceAll("\n", "\n" + dent + " ")).append(NEWL);