You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/10/05 11:56:53 UTC
[32/50] lucene-solr:feature/autoscaling_72: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/lucene-solr
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/34c176da
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/34c176da
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/34c176da
Branch: refs/heads/feature/autoscaling_72
Commit: 34c176da2971230ea1057ea5629bd6138bac0211
Parents: 9905736 17f5a4e
Author: Cao Manh Dat <da...@apache.org>
Authored: Wed Oct 4 15:25:32 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Wed Oct 4 15:25:32 2017 +0700
----------------------------------------------------------------------
.../morfologik-ukrainian-search-3.7.5.jar.sha1 | 1 +
solr/CHANGES.txt | 66 +-
.../org/apache/solr/cloud/ActionThrottle.java | 25 +-
.../org/apache/solr/cloud/AddReplicaCmd.java | 36 +-
.../src/java/org/apache/solr/cloud/Assign.java | 107 +-
.../java/org/apache/solr/cloud/CloudUtil.java | 7 +-
.../apache/solr/cloud/CreateCollectionCmd.java | 23 +-
.../org/apache/solr/cloud/CreateShardCmd.java | 148 ++-
.../apache/solr/cloud/DeleteCollectionCmd.java | 3 +
.../java/org/apache/solr/cloud/Overseer.java | 33 +-
.../OverseerAutoReplicaFailoverThread.java | 531 --------
.../cloud/OverseerCollectionMessageHandler.java | 10 +-
.../java/org/apache/solr/cloud/RestoreCmd.java | 218 ++--
.../org/apache/solr/cloud/SplitShardCmd.java | 7 +-
.../org/apache/solr/cloud/ZkController.java | 71 +-
.../solr/cloud/autoscaling/ActionContext.java | 68 ++
.../autoscaling/AutoAddReplicasPlanAction.java | 51 +
.../solr/cloud/autoscaling/AutoScaling.java | 170 +++
.../cloud/autoscaling/AutoScalingHandler.java | 573 +++++++--
.../cloud/autoscaling/ComputePlanAction.java | 115 ++
.../cloud/autoscaling/ExecutePlanAction.java | 177 +++
.../cloud/autoscaling/HttpTriggerListener.java | 178 +++
.../solr/cloud/autoscaling/LoggingListener.java | 38 +
.../cloud/autoscaling/NodeAddedTrigger.java | 320 +++++
.../solr/cloud/autoscaling/NodeLostTrigger.java | 318 +++++
.../autoscaling/OverseerTriggerThread.java | 369 ++++++
.../cloud/autoscaling/ScheduledTriggers.java | 638 ++++++++++
.../cloud/autoscaling/SystemLogListener.java | 219 ++++
.../solr/cloud/autoscaling/TriggerAction.java | 31 +
.../cloud/autoscaling/TriggerActionBase.java | 47 +
.../solr/cloud/autoscaling/TriggerBase.java | 107 ++
.../solr/cloud/autoscaling/TriggerEvent.java | 155 +++
.../cloud/autoscaling/TriggerEventQueue.java | 101 ++
.../solr/cloud/autoscaling/TriggerListener.java | 47 +
.../cloud/autoscaling/TriggerListenerBase.java | 47 +
.../solr/cloud/overseer/ReplicaMutator.java | 1 +
.../org/apache/solr/core/BlobRepository.java | 12 +-
.../java/org/apache/solr/core/CloudConfig.java | 37 +-
.../org/apache/solr/core/CoreContainer.java | 23 +-
.../org/apache/solr/core/MemClassLoader.java | 3 +-
.../src/java/org/apache/solr/core/SolrCore.java | 4 +-
.../org/apache/solr/core/SolrXmlConfig.java | 8 +-
.../org/apache/solr/handler/BlobHandler.java | 1 +
.../admin/AutoscalingHistoryHandler.java | 132 ++
.../solr/handler/admin/CollectionsHandler.java | 24 +-
.../solr/handler/admin/MetricsHandler.java | 11 +-
.../solr/security/PermissionNameProvider.java | 1 +
.../org/apache/solr/servlet/HttpSolrCall.java | 8 +-
.../src/java/org/apache/solr/util/IdUtils.java | 39 +
.../src/java/org/apache/solr/util/SolrCLI.java | 3 +-
.../java/org/apache/solr/util/TimeSource.java | 57 +
.../src/resources/SystemCollectionSchema.xml | 27 +-
.../apache/solr/cloud/ActionThrottleTest.java | 21 +-
.../apache/solr/cloud/ClusterStateMockUtil.java | 48 +-
.../solr/cloud/MoveReplicaHDFSFailoverTest.java | 207 ++++
.../solr/cloud/MoveReplicaHDFSUlogDirTest.java | 142 ---
.../org/apache/solr/cloud/NodeMutatorTest.java | 15 +-
...verseerCollectionConfigSetProcessorTest.java | 3 +
.../org/apache/solr/cloud/OverseerTest.java | 26 +-
.../org/apache/solr/cloud/ShardSplitTest.java | 1 -
.../cloud/SharedFSAutoReplicaFailoverTest.java | 215 ++--
.../SharedFSAutoReplicaFailoverUtilsTest.java | 191 ---
.../AutoAddReplicasIntegrationTest.java | 182 +++
.../AutoAddReplicasPlanActionTest.java | 195 +++
.../autoscaling/AutoScalingHandlerTest.java | 522 +++++++-
.../autoscaling/ComputePlanActionTest.java | 372 ++++++
.../autoscaling/ExecutePlanActionTest.java | 221 ++++
.../HdfsAutoAddReplicasIntegrationTest.java | 56 +
.../autoscaling/HttpTriggerListenerTest.java | 209 ++++
.../cloud/autoscaling/NodeAddedTriggerTest.java | 306 +++++
.../cloud/autoscaling/NodeLostTriggerTest.java | 348 ++++++
.../autoscaling/SystemLogListenerTest.java | 239 ++++
.../solr/cloud/autoscaling/TestPolicyCloud.java | 113 +-
.../autoscaling/TriggerIntegrationTest.java | 1139 ++++++++++++++++++
.../solr/core/BlobRepositoryCloudTest.java | 3 +-
.../admin/AutoscalingHistoryHandlerTest.java | 294 +++++
.../solr/handler/admin/MetricsHandlerTest.java | 9 -
solr/solr-ref-guide/src/collections-api.adoc | 1 +
.../src/fonts/Noto_Sans/LICENSE.txt | 404 +++----
.../src/solrcloud-autoscaling-api.adoc | 28 +
.../cloud/autoscaling/AddReplicaSuggester.java | 53 +-
.../cloud/autoscaling/AutoScalingConfig.java | 531 ++++++++
.../client/solrj/cloud/autoscaling/Clause.java | 247 ++--
.../cloud/autoscaling/ClusterDataProvider.java | 2 +-
.../cloud/autoscaling/MoveReplicaSuggester.java | 29 +-
.../solrj/cloud/autoscaling/NoneSuggester.java | 32 +
.../client/solrj/cloud/autoscaling/Operand.java | 23 +-
.../client/solrj/cloud/autoscaling/Policy.java | 305 +++--
.../solrj/cloud/autoscaling/PolicyHelper.java | 157 ++-
.../solrj/cloud/autoscaling/Preference.java | 42 +-
.../solrj/cloud/autoscaling/ReplicaCount.java | 92 ++
.../solrj/cloud/autoscaling/ReplicaInfo.java | 64 +
.../client/solrj/cloud/autoscaling/Row.java | 45 +-
.../autoscaling/TriggerEventProcessorStage.java | 30 +
.../cloud/autoscaling/TriggerEventType.java | 31 +
.../solr/client/solrj/impl/HttpClientUtil.java | 4 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 1 -
.../solrj/impl/SolrClientDataProvider.java | 74 +-
.../solrj/request/CollectionAdminRequest.java | 20 +-
.../java/org/apache/solr/common/MapWriter.java | 21 +
.../apache/solr/common/cloud/ClusterState.java | 15 +
.../solr/common/cloud/ClusterStateUtil.java | 13 +-
.../apache/solr/common/cloud/DocCollection.java | 7 +-
.../solr/common/cloud/LiveNodesListener.java | 38 +
.../org/apache/solr/common/cloud/Replica.java | 14 +-
.../solr/common/cloud/ReplicaPosition.java | 2 +-
.../apache/solr/common/cloud/ZkStateReader.java | 71 +-
.../solr/common/params/AutoScalingParams.java | 54 +
.../common/params/CollectionAdminParams.java | 4 +-
.../apache/solr/common/params/CommonParams.java | 5 +
.../solr/common/util/CommandOperation.java | 2 +-
.../resources/apispec/autoscaling.Commands.json | 147 +++
.../resources/apispec/collections.Commands.json | 5 +
.../collections.collection.Commands.modify.json | 5 +
.../solrj/cloud/autoscaling/TestPolicy.java | 786 +++++++++++-
115 files changed, 11750 insertions(+), 2177 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/34c176da/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index 0d61cc2,f3382ca..928d37f
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -174,10 -222,11 +222,13 @@@ Optimization
* SOLR-10285: Skip LEADER messages when there are leader only shards (Cao Manh Dat, Joshua Humphries)
+* SOLR-11424: When legacyCloud=false, cores should not publish itself as DOWN on startup. (Cao Manh Dat)
+
Other Changes
----------------------
+ * SOLR-10643: Throttling strategy for triggers and policy executions. (shalin)
+
+ * SOLR-10764: AutoScalingHandler should validate policy and preferences before updating zookeeper. (shalin)
* SOLR-10827: Factor out abstract FilteringSolrMetricReporter class. (Christine Poerschke)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/34c176da/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/34c176da/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 4467bc0,dd9e592..c3ce0ed
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@@ -1018,10 -1024,10 +1024,10 @@@ public class CoreContainer
MDCLoggingContext.setCoreDescriptor(this, dcore);
SolrIdentifierValidator.validateCoreName(dcore.getName());
if (zkSys.getZkController() != null) {
- zkSys.getZkController().preRegister(dcore);
+ zkSys.getZkController().preRegister(dcore, publishState);
}
- ConfigSet coreConfig = coreConfigService.getConfig(dcore);
+ ConfigSet coreConfig = getConfigSet(dcore);
dcore.setConfigSetTrusted(coreConfig.isTrusted());
log.info("Creating SolrCore '{}' using configuration from {}, trusted={}", dcore.getName(), coreConfig.getName(), dcore.isConfigSetTrusted());
try {