You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2020/07/20 19:42:08 UTC
[lucene-solr] 01/01: Merge branch 'master' into jira/LUCENE-9312
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch jira/LUCENE-9312
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit a8fdda60f944e12854f669b0e7003a73523b30b8
Merge: 5e1bdea 48e92ba
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Mon Jul 20 21:41:54 2020 +0200
Merge branch 'master' into jira/LUCENE-9312
solr/CHANGES.txt | 5 +
solr/bin/solr | 7 +-
solr/bin/solr.cmd | 10 +-
.../src/java/org/apache/solr/cloud/CloudUtil.java | 1 -
.../src/java/org/apache/solr/cloud/Overseer.java | 13 +-
.../java/org/apache/solr/cloud/ZkController.java | 41 -
.../solr/cloud/api/collections/AddReplicaCmd.java | 17 +-
.../apache/solr/cloud/api/collections/Assign.java | 139 +-
.../cloud/api/collections/CreateCollectionCmd.java | 20 +-
.../OverseerCollectionMessageHandler.java | 8 +-
.../api/collections/ReindexCollectionCmd.java | 5 +-
.../solr/cloud/api/collections/ReplaceNodeCmd.java | 7 -
.../solr/cloud/api/collections/RestoreCmd.java | 364 +-
.../solr/cloud/api/collections/SplitShardCmd.java | 52 +-
.../solr/cloud/api/collections/UtilizeNodeCmd.java | 139 -
.../solr/cloud/autoscaling/ActionContext.java | 68 -
.../autoscaling/AutoAddReplicasPlanAction.java | 40 -
.../apache/solr/cloud/autoscaling/AutoScaling.java | 246 -
.../solr/cloud/autoscaling/AutoScalingHandler.java | 742 --
.../solr/cloud/autoscaling/ComputePlanAction.java | 355 -
.../solr/cloud/autoscaling/ExecutePlanAction.java | 250 -
.../cloud/autoscaling/HttpTriggerListener.java | 164 -
.../autoscaling/InactiveMarkersPlanAction.java | 141 -
.../cloud/autoscaling/InactiveShardPlanAction.java | 163 -
.../solr/cloud/autoscaling/IndexSizeTrigger.java | 562 -
.../solr/cloud/autoscaling/LoggingListener.java | 38 -
.../solr/cloud/autoscaling/MetricTrigger.java | 220 -
.../solr/cloud/autoscaling/NodeAddedTrigger.java | 250 -
.../solr/cloud/autoscaling/NodeLostTrigger.java | 240 -
.../cloud/autoscaling/OverseerTriggerThread.java | 407 -
.../solr/cloud/autoscaling/ScheduledTrigger.java | 227 -
.../solr/cloud/autoscaling/ScheduledTriggers.java | 913 --
.../solr/cloud/autoscaling/SearchRateTrigger.java | 805 --
.../solr/cloud/autoscaling/SystemLogListener.java | 221 -
.../solr/cloud/autoscaling/TriggerAction.java | 51 -
.../solr/cloud/autoscaling/TriggerActionBase.java | 87 -
.../cloud/autoscaling/TriggerActionException.java | 33 -
.../apache/solr/cloud/autoscaling/TriggerBase.java | 300 -
.../solr/cloud/autoscaling/TriggerEvent.java | 315 -
.../solr/cloud/autoscaling/TriggerEventQueue.java | 121 -
.../solr/cloud/autoscaling/TriggerListener.java | 65 -
.../cloud/autoscaling/TriggerListenerBase.java | 97 -
.../solr/cloud/autoscaling/TriggerUtils.java | 88 -
.../autoscaling/TriggerValidationException.java | 74 -
.../solr/cloud/autoscaling/package-info.java | 21 -
.../solr/cloud/autoscaling/sim/ActionError.java | 24 -
.../cloud/autoscaling/sim/FakeDocIterator.java | 56 -
.../autoscaling/sim/GenericDistributedQueue.java | 601 -
.../sim/GenericDistributedQueueFactory.java | 45 -
.../solr/cloud/autoscaling/sim/LiveNodesSet.java | 113 -
.../sim/NoopDistributedQueueFactory.java | 94 -
.../cloud/autoscaling/sim/SimCloudManager.java | 1060 --
.../autoscaling/sim/SimClusterStateProvider.java | 2574 ----
.../autoscaling/sim/SimDistribStateManager.java | 649 -
.../sim/SimDistributedQueueFactory.java | 287 -
.../autoscaling/sim/SimNodeStateProvider.java | 359 -
.../solr/cloud/autoscaling/sim/SimScenario.java | 1129 --
.../solr/cloud/autoscaling/sim/SimUtils.java | 434 -
.../autoscaling/sim/SnapshotCloudManager.java | 260 -
.../sim/SnapshotClusterStateProvider.java | 152 -
.../sim/SnapshotDistribStateManager.java | 228 -
.../autoscaling/sim/SnapshotNodeStateProvider.java | 203 -
.../solr/cloud/autoscaling/sim/package-info.java | 94 -
.../apache/solr/cloud/overseer/ReplicaMutator.java | 2 +-
.../java/org/apache/solr/core/CoreContainer.java | 12 -
.../org/apache/solr/core/SolrResourceLoader.java | 3 +-
.../handler/admin/AutoscalingHistoryHandler.java | 166 -
.../solr/handler/admin/CollectionsHandler.java | 12 +-
.../solr/handler/admin/MetricsHistoryHandler.java | 6 +-
.../apache/solr/parser/SolrQueryParserBase.java | 27 +-
.../solr/security/PermissionNameProvider.java | 3 -
.../src/java/org/apache/solr/util/SolrCLI.java | 390 -
.../solr/simSnapshot/autoscalingState.json | 3923 ------
.../test-files/solr/simSnapshot/clusterState.json | 2838 ----
.../test-files/solr/simSnapshot/distribState.json | 206 -
.../test-files/solr/simSnapshot/managerState.json | 1 -
.../src/test-files/solr/simSnapshot/nodeState.json | 3823 ------
.../test-files/solr/simSnapshot/statistics.json | 2029 ---
.../test/org/apache/solr/cloud/CloudTestUtils.java | 195 -
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 18 +-
.../solr/cloud/MetricsHistoryIntegrationTest.java | 24 +-
.../org/apache/solr/cloud/MoveReplicaTest.java | 2 -
.../OverseerCollectionConfigSetProcessorTest.java | 11 +-
.../apache/solr/cloud/ReplaceNodeNoTargetTest.java | 127 -
.../cloud/RoutingToNodesWithPropertiesTest.java | 242 -
.../cloud/SharedFSAutoReplicaFailoverTest.java | 14 +-
.../apache/solr/cloud/TestClusterProperties.java | 12 -
.../org/apache/solr/cloud/TestUtilizeNode.java | 184 -
.../org/apache/solr/cloud/TestWithCollection.java | 611 -
.../AbstractCloudBackupRestoreTestCase.java | 4 -
.../solr/cloud/api/collections/AssignTest.java | 204 -
.../collections/CollectionTooManyReplicasTest.java | 13 +-
.../ConcurrentCreateCollectionTest.java | 292 -
.../AutoAddReplicasIntegrationTest.java | 472 -
.../autoscaling/AutoAddReplicasPlanActionTest.java | 263 -
.../cloud/autoscaling/AutoScalingHandlerTest.java | 1114 --
.../solr/cloud/autoscaling/CapturedEvent.java | 65 -
.../cloud/autoscaling/ComputePlanActionTest.java | 794 --
.../cloud/autoscaling/ExecutePlanActionTest.java | 381 -
.../HdfsAutoAddReplicasIntegrationTest.java | 61 -
.../cloud/autoscaling/HttpTriggerListenerTest.java | 208 -
.../IndexSizeTriggerMixedBoundsTest.java | 374 -
.../IndexSizeTriggerSizeEstimationTest.java | 323 -
.../cloud/autoscaling/IndexSizeTriggerTest.java | 795 --
.../autoscaling/MetricTriggerIntegrationTest.java | 242 -
.../solr/cloud/autoscaling/MetricTriggerTest.java | 135 -
.../NodeAddedTriggerIntegrationTest.java | 320 -
.../cloud/autoscaling/NodeAddedTriggerTest.java | 345 -
.../NodeLostTriggerIntegrationTest.java | 356 -
.../cloud/autoscaling/NodeLostTriggerTest.java | 394 -
.../autoscaling/NodeMarkersRegistrationTest.java | 356 -
.../cloud/autoscaling/RestoreTriggerStateTest.java | 168 -
.../ScheduledMaintenanceTriggerTest.java | 384 -
.../ScheduledTriggerIntegrationTest.java | 150 -
.../cloud/autoscaling/ScheduledTriggerTest.java | 141 -
.../SearchRateTriggerIntegrationTest.java | 747 --
.../cloud/autoscaling/SearchRateTriggerTest.java | 357 -
.../cloud/autoscaling/SystemLogListenerTest.java | 293 -
.../solr/cloud/autoscaling/TestPolicyCloud.java | 542 -
.../TriggerCooldownIntegrationTest.java | 228 -
.../cloud/autoscaling/TriggerEventQueueTest.java | 99 -
.../cloud/autoscaling/TriggerIntegrationTest.java | 729 -
.../TriggerSetPropertiesIntegrationTest.java | 275 -
.../autoscaling/sim/SimSolrCloudTestCase.java | 255 -
.../sim/TestSimClusterStateProvider.java | 227 -
.../autoscaling/sim/TestSimComputePlanAction.java | 401 -
.../sim/TestSimDistribStateManager.java | 380 -
.../autoscaling/sim/TestSimDistributedQueue.java | 221 -
.../autoscaling/sim/TestSimExecutePlanAction.java | 224 -
.../autoscaling/sim/TestSimExtremeIndexing.java | 147 -
.../sim/TestSimGenericDistributedQueue.java | 38 -
.../cloud/autoscaling/sim/TestSimLargeCluster.java | 870 --
.../autoscaling/sim/TestSimNodeAddedTrigger.java | 331 -
.../autoscaling/sim/TestSimNodeLostTrigger.java | 350 -
.../cloud/autoscaling/sim/TestSimPolicyCloud.java | 379 -
.../cloud/autoscaling/sim/TestSimScenario.java | 173 -
.../autoscaling/sim/TestSimTriggerIntegration.java | 1551 ---
.../solr/cloud/autoscaling/sim/TestSimUtils.java | 95 -
.../autoscaling/sim/TestSnapshotCloudManager.java | 275 -
.../org/apache/solr/cloud/rule/RuleEngineTest.java | 2 +-
.../test/org/apache/solr/cloud/rule/RulesTest.java | 67 -
.../apache/solr/handler/V2ApiIntegrationTest.java | 4 +-
.../admin/AutoscalingHistoryHandlerTest.java | 463 -
.../handler/admin/MetricsHistoryHandlerTest.java | 43 +-
.../solr/handler/admin/TestCollectionAPIs.java | 4 +-
.../solr/parser/SolrQueryParserBaseTest.java | 137 +
.../security/JWTAuthPluginIntegrationTest.java | 6 +-
.../hadoop/TestSolrCloudWithHadoopAuthPlugin.java | 6 +-
.../apache/solr/util/TestSolrCLIRunExample.java | 117 -
.../src/test/org/apache/solr/util/TestUtils.java | 1 -
.../src/cluster-node-management.adoc | 19 +-
solr/solr-ref-guide/src/collection-management.adoc | 19 +-
.../solr-ref-guide/src/colocating-collections.adoc | 75 -
.../src/major-changes-in-solr-7.adoc | 2 -
.../src/major-changes-in-solr-8.adoc | 6 +-
.../src/major-changes-in-solr-9.adoc | 10 +
solr/solr-ref-guide/src/metrics-history.adoc | 2 +-
.../solr-ref-guide/src/migrate-to-policy-rule.adoc | 198 -
solr/solr-ref-guide/src/replica-management.adoc | 2 -
.../src/rule-based-authorization-plugin.adoc | 15 -
solr/solr-ref-guide/src/running-solr-on-hdfs.adoc | 39 -
solr/solr-ref-guide/src/shard-management.adoc | 6 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 4 +-
.../src/solrcloud-autoscaling-api.adoc | 808 --
.../solrcloud-autoscaling-auto-add-replicas.adoc | 73 -
.../src/solrcloud-autoscaling-fault-tolerance.adoc | 59 -
.../src/solrcloud-autoscaling-listeners.adoc | 220 -
.../src/solrcloud-autoscaling-overview.adoc | 116 -
.../solrcloud-autoscaling-policy-preferences.adoc | 638 -
.../src/solrcloud-autoscaling-trigger-actions.adoc | 145 -
.../src/solrcloud-autoscaling-triggers.adoc | 627 -
solr/solr-ref-guide/src/solrcloud-autoscaling.adoc | 35 -
solr/solr-ref-guide/src/solrcloud.adoc | 6 +-
solr/solr-ref-guide/src/suggestions-screen.adoc | 40 -
...ing-the-solr-administration-user-interface.adoc | 3 +-
solr/solr-ref-guide/src/v2-api.adoc | 7 +-
.../{autoscaling => }/AlreadyExistsException.java | 2 +-
.../{autoscaling => }/BadVersionException.java | 2 +-
.../client/solrj/cloud/DelegatingCloudManager.java | 89 +
.../cloud/DelegatingClusterStateProvider.java | 130 +
.../client/solrj/cloud/DistribStateManager.java | 11 -
.../cloud/{autoscaling => }/NotEmptyException.java | 2 +-
.../cloud/{autoscaling => }/VersionedData.java | 2 +-
.../cloud/autoscaling/AddReplicaSuggester.java | 84 -
.../solrj/cloud/autoscaling/AutoScalingConfig.java | 616 -
.../solr/client/solrj/cloud/autoscaling/Cell.java | 74 -
.../client/solrj/cloud/autoscaling/Clause.java | 839 --
.../solrj/cloud/autoscaling/ComputedType.java | 99 -
.../client/solrj/cloud/autoscaling/Condition.java | 125 -
.../solrj/cloud/autoscaling/CoresVariable.java | 127 -
.../cloud/autoscaling/DelegatingCloudManager.java | 93 -
.../DelegatingClusterStateProvider.java | 130 -
.../autoscaling/DelegatingDistribStateManager.java | 107 -
.../autoscaling/DelegatingNodeStateProvider.java | 57 -
.../cloud/autoscaling/DeleteNodeSuggester.java | 48 -
.../cloud/autoscaling/DeleteReplicaSuggester.java | 78 -
.../solrj/cloud/autoscaling/FreeDiskVariable.java | 176 -
.../cloud/autoscaling/MoveReplicaSuggester.java | 115 -
.../solrj/cloud/autoscaling/NodeVariable.java | 44 -
.../solrj/cloud/autoscaling/NoneSuggester.java | 41 -
.../client/solrj/cloud/autoscaling/Operand.java | 210 -
.../client/solrj/cloud/autoscaling/Policy.java | 792 --
.../solrj/cloud/autoscaling/PolicyHelper.java | 733 --
.../client/solrj/cloud/autoscaling/Preference.java | 157 -
.../client/solrj/cloud/autoscaling/RangeVal.java | 61 -
.../solrj/cloud/autoscaling/ReplicaCount.java | 134 -
.../solrj/cloud/autoscaling/ReplicaVariable.java | 176 -
.../solr/client/solrj/cloud/autoscaling/Row.java | 402 -
.../solrj/cloud/autoscaling/SealedClause.java | 29 -
.../cloud/autoscaling/SplitShardSuggester.java | 68 -
.../client/solrj/cloud/autoscaling/Suggester.java | 530 -
.../client/solrj/cloud/autoscaling/Suggestion.java | 133 -
.../autoscaling/TriggerEventProcessorStage.java | 30 -
.../solrj/cloud/autoscaling/TriggerEventType.java | 33 -
.../cloud/autoscaling/UnsupportedSuggester.java | 61 -
.../client/solrj/cloud/autoscaling/Variable.java | 410 -
.../solrj/cloud/autoscaling/VariableBase.java | 213 -
.../client/solrj/cloud/autoscaling/Violation.java | 182 -
.../cloud/autoscaling/WithCollectionVariable.java | 170 -
.../solrj/cloud/autoscaling/package-info.java | 23 -
.../solrj/impl/SolrClientNodeStateProvider.java | 85 +-
.../client/solrj/impl/ZkDistribStateManager.java | 34 +-
.../solrj/request/CollectionAdminRequest.java | 42 -
.../client/solrj/request/CollectionApiMapping.java | 5 -
.../apache/solr/common/cloud/DocCollection.java | 19 -
.../apache/solr/common/cloud/ZkStateReader.java | 44 -
.../solr/common/params/AutoScalingParams.java | 76 -
.../solr/common/params/CollectionAdminParams.java | 6 -
.../solr/common/params/CollectionParams.java | 1 -
.../apache/solr/common/params/CommonParams.java | 10 +-
.../java/org/apache/solr/common/util/Utils.java | 2 +-
.../resources/apispec/autoscaling.Commands.json | 199 -
.../src/resources/apispec/autoscaling.history.json | 61 -
.../src/resources/apispec/cluster.Commands.json | 25 -
.../resources/apispec/collections.Commands.json | 11 -
.../collections.collection.Commands.modify.json | 11 -
.../solr/autoscaling/testAddMissingReplica.json | 122 -
.../solr/autoscaling/testAddTooManyPerPolicy.json | 129 -
.../autoscaling/testAutoScalingHandlerFailure.json | 141 -
...testAutoscalingPreferencesUsedWithNoPolicy.json | 52 -
.../autoscaling/testComputePlanAfterNodeAdded.json | 16 -
.../solr/autoscaling/testCoresSuggestions.json | 17 -
.../testCreateCollectionWithEmptyPolicy.json | 20 -
.../solrj/solr/autoscaling/testDiskSpaceHint.json | 16 -
.../solr/autoscaling/testEmptyCollection.json | 26 -
.../solrj/solr/autoscaling/testEqualOnNonNode.json | 83 -
.../solr/autoscaling/testFreeDiskDeviation.json | 35 -
.../solr/autoscaling/testFreeDiskSuggestions.json | 27 -
.../solr/autoscaling/testFreediskPercentage.json | 25 -
.../solrj/solr/autoscaling/testHostAttribute.json | 119 -
.../solrj/solr/autoscaling/testInfiniteLoop.json | 13173 -------------------
.../solr/autoscaling/testMoveReplicaSuggester.json | 15 -
.../testMoveReplicasInMultipleCollections.json | 86 -
.../solrj/solr/autoscaling/testPolicy.json | 41 -
.../solr/autoscaling/testPortSuggestions.json | 22 -
.../autoscaling/testReplicaCountSuggestions.json | 15 -
.../solr/autoscaling/testReplicaPercentage.json | 46 -
.../autoscaling/testReplicaZonesPercentage.json | 15 -
.../autoscaling/testScheduledTriggerFailure.json | 52 -
.../solrj/solr/autoscaling/testSortError.json | 225 -
.../autoscaling/testSuggestionsRebalance2.json | 131 -
.../autoscaling/testSuggestionsRebalanceOnly.json | 105 -
.../solr/autoscaling/testSysPropSuggestions.json | 127 -
.../solr/autoscaling/testSyspropSuggestions1.json | 24 -
.../solr/autoscaling/testUnresolvedSuggestion.json | 211 -
.../solr/autoscaling/testUtilizeNodeFailure.json | 69 -
.../solr/autoscaling/testUtilizeNodeFailure2.json | 66 -
.../solr/autoscaling/testViolationOutput.json | 22 -
.../solrj/solr/autoscaling/testWithCollection.json | 21 -
.../autoscaling/testWithCollectionMoveReplica.json | 28 -
.../testWithCollectionMoveVsAddSuggestions.json | 49 -
.../autoscaling/testWithCollectionSuggestions.json | 21 -
.../solrj/cloud/autoscaling/ConditionTest.java | 80 -
.../autoscaling/MoveReplicaSuggesterTest.java | 104 -
.../client/solrj/cloud/autoscaling/TestPolicy.java | 3358 -----
.../solrj/cloud/autoscaling/TestPolicy2.java | 540 -
.../solrj/cloud/autoscaling/TestPolicy2Old.java | 26 -
.../solrj/cloud/autoscaling/TestPolicyOld.java | 25 -
.../solrj/impl/CloudSolrClientCacheTest.java | 3 +-
solr/webapp/web/css/angular/menu.css | 1 -
solr/webapp/web/css/angular/suggestions.css | 64 -
solr/webapp/web/index.html | 3 -
solr/webapp/web/js/angular/app.js | 4 -
solr/webapp/web/js/angular/controllers/cloud.js | 2 -
.../js/angular/controllers/cluster-suggestions.js | 62 -
.../web/js/angular/controllers/collections.js | 6 +-
solr/webapp/web/partials/cluster_suggestions.html | 49 -
solr/webapp/web/partials/collection_overview.html | 3 -
solr/webapp/web/partials/collections.html | 12 -
289 files changed, 741 insertions(+), 80202 deletions(-)