[lucene-solr] branch master updated: SOLR-13849: Ignore events created by running triggers.

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new f7f6a37  SOLR-13849: Ignore events created by running triggers.
f7f6a37 is described below

commit f7f6a37f337ea99892ffa739e99a7dd370ea2f49
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed Oct 16 10:32:54 2019 +0200

    SOLR-13849: Ignore events created by running triggers.
---
 .../solr/cloud/autoscaling/sim/TestSnapshotCloudManager.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSnapshotCloudManager.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSnapshotCloudManager.java
index b1bd7f4..50fa634 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSnapshotCloudManager.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSnapshotCloudManager.java
@@ -215,10 +215,16 @@ public class TestSnapshotCloudManager extends SolrCloudTestCase {
 
   // ignore these because SimCloudManager always modifies them
   private static final Set<Pattern> IGNORE_DISTRIB_STATE_PATTERNS = new HashSet<>(Arrays.asList(
-      Pattern.compile("/autoscaling/triggerState.*"),
-      Pattern.compile("/clusterstate\\.json"), // different format in SimClusterStateProvider
+      Pattern.compile("/autoscaling/triggerState/.*"),
+      // some triggers may have run after the snapshot was taken
+      Pattern.compile("/autoscaling/events/.*"),
+      // we always use format 1 in SimClusterStateProvider
+      Pattern.compile("/clusterstate\\.json"),
+      // depending on the startup sequence leaders may differ
       Pattern.compile("/collections/[^/]+?/leader_elect/.*"),
       Pattern.compile("/collections/[^/]+?/leaders/.*"),
+      Pattern.compile("/collections/[^/]+?/terms/.*"),
+      Pattern.compile("/overseer_elect/election/.*"),
       Pattern.compile("/live_nodes/.*")
   ));