You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/05/25 17:39:42 UTC
[6/6] lucene-solr:jira/solr-8668: Merge commit
'2fc41d565a4a0408a09856a37d3be7d87414ba3f' into jira/solr-8668
Merge commit '2fc41d565a4a0408a09856a37d3be7d87414ba3f' into jira/solr-8668
Resolved Conflicts:
solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ab9aad20
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ab9aad20
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ab9aad20
Branch: refs/heads/jira/solr-8668
Commit: ab9aad20ab499ddc3977c0c012046a369b16f8b9
Parents: e4cbe0e 2fc41d5
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu May 25 18:39:11 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu May 25 18:39:11 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 14 +
.../org/apache/solr/cloud/AddReplicaCmd.java | 9 +-
.../src/java/org/apache/solr/cloud/Assign.java | 12 +-
.../org/apache/solr/cloud/CloudDescriptor.java | 25 +-
.../apache/solr/cloud/CreateCollectionCmd.java | 40 +-
.../org/apache/solr/cloud/CreateShardCmd.java | 48 +-
.../org/apache/solr/cloud/ElectionContext.java | 13 +-
.../java/org/apache/solr/cloud/MigrateCmd.java | 8 +-
.../org/apache/solr/cloud/MoveReplicaCmd.java | 4 +-
.../cloud/OverseerCollectionMessageHandler.java | 91 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 166 +++-
.../org/apache/solr/cloud/ReplaceNodeCmd.java | 4 +-
.../apache/solr/cloud/ReplicateFromLeader.java | 42 +-
.../java/org/apache/solr/cloud/RestoreCmd.java | 71 +-
.../org/apache/solr/cloud/SplitShardCmd.java | 4 +-
.../org/apache/solr/cloud/ZkController.java | 67 +-
.../solr/cloud/overseer/ReplicaMutator.java | 7 +-
.../solr/cloud/overseer/SliceMutator.java | 24 +-
.../solr/cloud/overseer/ZkStateWriter.java | 1 +
.../apache/solr/cloud/rule/ReplicaAssigner.java | 6 +-
.../org/apache/solr/core/CoreContainer.java | 38 +-
.../org/apache/solr/handler/IndexFetcher.java | 23 +-
.../apache/solr/handler/RealTimeGetHandler.java | 20 +-
.../apache/solr/handler/ReplicationHandler.java | 4 +
.../solr/handler/admin/CollectionsHandler.java | 17 +-
.../solr/handler/admin/CoreAdminHandler.java | 1 +
.../solr/handler/admin/PrepRecoveryOp.java | 30 +-
.../handler/component/HttpShardHandler.java | 37 +-
.../handler/component/RealTimeGetComponent.java | 27 +-
.../solr/update/DirectUpdateHandler2.java | 20 +-
.../org/apache/solr/update/UpdateHandler.java | 6 +-
.../java/org/apache/solr/update/UpdateLog.java | 7 +-
.../processor/DistributedUpdateProcessor.java | 51 +-
.../org/apache/solr/util/TestInjection.java | 6 +-
.../solr/collection1/conf/solrconfig.xml | 8 +-
.../cloud-minimal/conf/solrconfig.xml | 2 +-
.../AbstractCloudBackupRestoreTestCase.java | 29 +-
.../test/org/apache/solr/cloud/AssignTest.java | 6 +
.../solr/cloud/BasicDistributedZk2Test.java | 4 +-
.../solr/cloud/BasicDistributedZkTest.java | 10 +-
.../cloud/ChaosMonkeyNothingIsSafeTest.java | 136 +--
...MonkeyNothingIsSafeWithPullReplicasTest.java | 327 +++++++
...aosMonkeySafeLeaderWithPullReplicasTest.java | 254 ++++++
.../cloud/CollectionsAPIDistributedZkTest.java | 4 +-
.../solr/cloud/CollectionsAPISolrJTest.java | 18 +-
.../org/apache/solr/cloud/DeleteNodeTest.java | 11 +-
.../apache/solr/cloud/DeleteReplicaTest.java | 22 +-
.../org/apache/solr/cloud/ForceLeaderTest.java | 4 +-
.../FullThrottleStoppableIndexingThread.java | 156 ++++
.../apache/solr/cloud/HttpPartitionTest.java | 8 +-
.../LeaderInitiatedRecoveryOnCommitTest.java | 8 +-
.../solr/cloud/OnlyLeaderIndexesTest.java | 435 ----------
...verseerCollectionConfigSetProcessorTest.java | 3 +-
.../solr/cloud/RecoveryAfterSoftCommitTest.java | 8 +-
.../org/apache/solr/cloud/ReplaceNodeTest.java | 21 +-
.../solr/cloud/ReplicationFactorTest.java | 4 +-
.../org/apache/solr/cloud/ShardSplitTest.java | 6 -
.../apache/solr/cloud/TestCloudRecovery.java | 5 +-
.../apache/solr/cloud/TestCollectionAPI.java | 10 +-
.../org/apache/solr/cloud/TestPullReplica.java | 576 +++++++++++++
.../cloud/TestPullReplicaErrorHandling.java | 344 ++++++++
.../org/apache/solr/cloud/TestTlogReplica.java | 845 +++++++++++++++++++
.../cloud/hdfs/HdfsBasicDistributedZkTest.java | 4 +-
.../reporters/solr/SolrCloudReportersTest.java | 2 +-
.../solr/update/TestInPlaceUpdatesDistrib.java | 10 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 23 +-
.../solrj/request/CollectionAdminRequest.java | 121 ++-
.../apache/solr/common/cloud/DocCollection.java | 56 +-
.../org/apache/solr/common/cloud/Replica.java | 32 +
.../org/apache/solr/common/cloud/Slice.java | 21 +-
.../apache/solr/common/cloud/ZkStateReader.java | 16 +-
.../solr/common/params/CoreAdminParams.java | 5 +
...ollectionAdminRequestRequiredParamsTest.java | 9 +
.../solr/BaseDistributedSearchTestCase.java | 3 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 31 +-
.../cloud/AbstractFullDistribZkTestBase.java | 264 +++++-
.../java/org/apache/solr/cloud/ChaosMonkey.java | 159 +++-
.../solr/cloud/StoppableCommitThread.java | 69 ++
.../solr/cloud/StoppableIndexingThread.java | 2 +-
.../solr/cloud/StoppableSearchThread.java | 2 +-
80 files changed, 4026 insertions(+), 1010 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ab9aad20/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ab9aad20/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --cc solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 629666e,a55e2ea..f41f9cf
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@@ -2435,6 -2450,37 +2442,10 @@@ public abstract class SolrTestCaseJ4 ex
newestSearcher.decref();
}
+ protected void waitForWarming() throws InterruptedException {
+ waitForWarming(h.getCore());
+ }
+
- @BeforeClass
- public static void chooseMPForMP() throws Exception {
- if (random().nextBoolean()) {
- System.setProperty(SYSTEM_PROPERTY_SOLR_TESTS_USEMERGEPOLICYFACTORY, "true");
- System.setProperty(SYSTEM_PROPERTY_SOLR_TESTS_USEMERGEPOLICY, "false");
- } else {
- System.setProperty(SYSTEM_PROPERTY_SOLR_TESTS_USEMERGEPOLICYFACTORY, "false");
- System.setProperty(SYSTEM_PROPERTY_SOLR_TESTS_USEMERGEPOLICY, "true");
- }
- }
-
- @AfterClass
- public static void unchooseMPForMP() {
- System.clearProperty(SYSTEM_PROPERTY_SOLR_TESTS_USEMERGEPOLICYFACTORY);
- System.clearProperty(SYSTEM_PROPERTY_SOLR_TESTS_USEMERGEPOLICY);
- }
-
- @Deprecated // remove with SOLR-8668
- protected static void systemSetPropertySolrTestsMergePolicy(String value) {
- System.setProperty(SYSTEM_PROPERTY_SOLR_TESTS_MERGEPOLICY, value);
- }
-
- @Deprecated // remove with SOLR-8668
- protected static void systemClearPropertySolrTestsMergePolicy() {
- System.clearProperty(SYSTEM_PROPERTY_SOLR_TESTS_MERGEPOLICY);
- }
-
protected static void systemSetPropertySolrTestsMergePolicyFactory(String value) {
System.setProperty(SYSTEM_PROPERTY_SOLR_TESTS_MERGEPOLICYFACTORY, value);
}