You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/04/02 07:38:20 UTC
[33/34] lucene-solr:jira/solr-12095: Merge branch 'master' into
jira/solr-12095
Merge branch 'master' into jira/solr-12095
# Conflicts:
# solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
# solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
# solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.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/07962265
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/07962265
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/07962265
Branch: refs/heads/jira/solr-12095
Commit: 0796226509e6df433a4648b2bf7d9d0edd629a6c
Parents: 059f495 a4789db
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Mon Apr 2 12:59:44 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Mon Apr 2 12:59:44 2018 +0530
----------------------------------------------------------------------
build.xml | 2 +-
dev-tools/scripts/reproduceJenkinsFailures.py | 1 +
.../lucene/index/BufferedUpdatesStream.java | 4 +-
.../org/apache/lucene/index/IndexWriter.java | 30 +-
.../org/apache/lucene/index/PendingDeletes.java | 193 +++
.../apache/lucene/index/ReadersAndUpdates.java | 185 +--
.../src/java/org/apache/lucene/util/Bits.java | 2 +-
.../apache/lucene/index/TestPendingDeletes.java | 142 +++
.../spatial3d/geom/GeoComplexPolygon.java | 686 ++++------
.../spatial3d/geom/GeoConcavePolygon.java | 16 +-
.../lucene/spatial3d/geom/GeoConvexPolygon.java | 20 +-
.../spatial3d/geom/GeoPolygonFactory.java | 7 +-
.../org/apache/lucene/spatial3d/geom/Plane.java | 60 +-
.../lucene/spatial3d/geom/GeoPolygonTest.java | 262 +++-
solr/CHANGES.txt | 16 +
.../org/apache/solr/cloud/ZkController.java | 22 +-
.../cloud/autoscaling/NodeAddedTrigger.java | 2 +-
.../solr/cloud/autoscaling/NodeLostTrigger.java | 2 +-
.../autoscaling/OverseerTriggerThread.java | 4 +
.../cloud/autoscaling/ScheduledTriggers.java | 13 +
.../org/apache/solr/core/CoreContainer.java | 7 +-
.../apache/solr/core/CorePropertiesLocator.java | 2 +-
.../org/apache/solr/handler/IndexFetcher.java | 35 +-
.../org/apache/solr/util/TestInjection.java | 15 +
.../solr/cloud/DeleteInactiveReplicaTest.java | 22 +-
.../solr/cloud/DocValuesNotIndexedTest.java | 1 +
.../solr/cloud/LIROnShardRestartTest.java | 17 +-
.../solr/cloud/RestartWhileUpdatingTest.java | 1 +
.../apache/solr/cloud/TestCloudConsistency.java | 2 +
.../org/apache/solr/cloud/TestPullReplica.java | 5 +-
.../apache/solr/cloud/TestSegmentSorting.java | 2 +
.../CollectionsAPIDistributedZkTest.java | 1 +
.../autoscaling/ComputePlanActionTest.java | 25 +-
.../MetricTriggerIntegrationTest.java | 242 ++++
.../NodeAddedTriggerIntegrationTest.java | 300 +++++
.../NodeLostTriggerIntegrationTest.java | 322 +++++
.../NodeMarkersRegistrationTest.java | 269 ++++
.../autoscaling/RestoreTriggerStateTest.java | 169 +++
.../ScheduledTriggerIntegrationTest.java | 142 +++
.../SearchRateTriggerIntegrationTest.java | 217 ++++
.../TriggerCooldownIntegrationTest.java | 238 ++++
.../autoscaling/TriggerIntegrationTest.java | 1194 +-----------------
.../TriggerSetPropertiesIntegrationTest.java | 195 +++
.../autoscaling/sim/TestTriggerIntegration.java | 1 +
.../cloud/hdfs/HdfsBasicDistributedZk2Test.java | 2 +
.../solr/handler/TestReplicationHandler.java | 7 +-
.../admin/AutoscalingHistoryHandlerTest.java | 3 +-
solr/solr-ref-guide/src/highlighting.adoc | 23 +-
.../apache/solr/common/util/ExecutorUtil.java | 4 +
49 files changed, 3306 insertions(+), 1826 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/07962265/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
index d83f8b9,6190a49..484fbe0
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
@@@ -53,11 -58,8 +53,11 @@@ public class NodeAddedTrigger extends T
}
@Override
- public void init() {
+ public void init() throws Exception {
super.init();
+ lastLiveNodes = new HashSet<>(cloudManager.getClusterStateProvider().getLiveNodes());
- log.debug("Initial livenodes: {}", lastLiveNodes);
++ log.debug("NodeAddedTrigger {} - Initial livenodes: {}", name, lastLiveNodes);
+ log.debug("NodeAddedTrigger {} instantiated with properties: {}", name, properties);
// pick up added nodes for which marker paths were created
try {
List<String> added = stateManager.listData(ZkStateReader.SOLR_AUTOSCALING_NODE_ADDED_PATH);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/07962265/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
index 5bf243f,2981a48..6dfccb2
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
@@@ -52,10 -56,8 +52,10 @@@ public class NodeLostTrigger extends Tr
}
@Override
- public void init() {
+ public void init() throws Exception {
super.init();
+ lastLiveNodes = new HashSet<>(cloudManager.getClusterStateProvider().getLiveNodes());
- log.debug("Initial livenodes: {}", lastLiveNodes);
++ log.debug("NodeLostTrigger {} - Initial livenodes: {}", name, lastLiveNodes);
// pick up lost nodes for which marker paths were created
try {
List<String> lost = stateManager.listData(ZkStateReader.SOLR_AUTOSCALING_NODE_LOST_PATH);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/07962265/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/07962265/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/07962265/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java
----------------------------------------------------------------------
diff --cc solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java
index 5952e40,67b5fa0..4e48f59
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ComputePlanActionTest.java
@@@ -366,19 -376,9 +377,19 @@@ public class ComputePlanActionTest exte
}
public static class AssertingTriggerAction implements TriggerAction {
- static String expectedNode;
+ static volatile String expectedNode;
@Override
+ public void configure(SolrResourceLoader loader, SolrCloudManager cloudManager, Map<String, Object> properties) throws TriggerValidationException {
+
+ }
+
+ @Override
+ public void init() {
+
+ }
+
+ @Override
public String getName() {
return null;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/07962265/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/07962265/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestTriggerIntegration.java
----------------------------------------------------------------------