Skip to content

Fix tests to actually do a ZK Connection Loss #3290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions solr/api/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,swaggerBuild,testRuntimeCl
org.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspath
org.apache.curator:curator-client:5.8.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-framework:5.8.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath
org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testCompileClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -133,7 +132,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,testRuntimeClasspath
org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper-jute:3.9.2=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper:3.9.2=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath
org.eclipse.jetty.http2:http2-client:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -169,11 +167,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,testRun
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=jarValidation,swaggerBuild,swaggerDeps,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
org.locationtech.spatial4j:spatial4j:0.8=jarValidation,testRuntimeClasspath
org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
org.ow2.asm:asm-commons:9.7.1=jarValidation,testRuntimeClasspath
org.ow2.asm:asm-tree:9.7.1=jarValidation,testRuntimeClasspath
org.ow2.asm:asm:9.7.1=jarValidation,testRuntimeClasspath
Expand Down
6 changes: 0 additions & 6 deletions solr/benchmark/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,testRunti
org.apache.commons:commons-math3:3.6.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-test:5.8.0=jarValidation,runtimeClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -104,7 +103,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,runtimeClasspath,testRunti
org.apache.lucene:lucene-test-framework:9.12.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=jarValidation,runtimeClasspath,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -141,13 +139,9 @@ org.hamcrest:hamcrest:3.0=compileClasspath,jarValidation,runtimeClasspath,testCo
org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,testRuntimeClasspath
org.jctools:jctools-core:4.0.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath
org.junit:junit-bom:5.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath
org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,testRuntimeClasspath
org.openjdk.jmh:jmh-core:1.37=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.openjdk.jmh:jmh-generator-annprocess:1.37=annotationProcessor
org.opentest4j:opentest4j:1.2.0=jarValidation,runtimeClasspath,testRuntimeClasspath
org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,testRuntimeClasspath
org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,testRuntimeClasspath
org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,testRuntimeClasspath
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.NoSuchElementException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Predicate;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.cloud.DistributedQueue;
import org.apache.solr.common.cloud.OnDisconnect;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.SolrNamedThreadFactory;
Expand Down Expand Up @@ -163,7 +161,7 @@ public void testDistributedQueueBlocking() throws Exception {
assertFalse(dq.isDirty());
assertEquals(1, dq.watcherCount());

forceSessionExpire();
ChaosMonkey.expireSession(zkClient, zkServer);

// Session expiry should have fired the watcher.
Thread.sleep(100);
Expand Down Expand Up @@ -290,28 +288,6 @@ public void testPeekElements() throws Exception {
"Time was " + timeTaken + "ms, expected 250-1500ms", timeTaken > 250 && timeTaken < 1500);
}

private void forceSessionExpire() throws InterruptedException, TimeoutException {
final CountDownLatch hasDisconnected = new CountDownLatch(1);
zkClient
.getCuratorFramework()
.getConnectionStateListenable()
.addListener(
(OnDisconnect)
((sessionExpired) -> {
if (sessionExpired) {
hasDisconnected.countDown();
}
}));
long sessionId = zkClient.getZkSessionId();
zkServer.expire(sessionId);
hasDisconnected.await(10, TimeUnit.SECONDS);
assertEquals(
"ZK Client did not disconnect after session expiration", 0, hasDisconnected.getCount());
zkClient.getCuratorFramework().blockUntilConnected(10, TimeUnit.SECONDS);
assertTrue(zkClient.isConnected());
assertNotEquals(sessionId, zkClient.getZkSessionId());
}

protected ZkDistributedQueue makeDistributedQueue(String dqZNode) throws Exception {
return new ZkDistributedQueue(zkClient, setupNewDistributedQueueZNode(dqZNode));
}
Expand Down
6 changes: 0 additions & 6 deletions solr/cross-dc-manager/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLi
org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath
org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -140,7 +139,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,runtimeClasspath,runtimeLi
org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.bitbucket.b_c:jose4j:0.9.6=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
Expand Down Expand Up @@ -182,14 +180,10 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtime
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.lz4:lz4-java:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.mockito:mockito-core:5.16.1=jarValidation,testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath
org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
Expand Down
6 changes: 0 additions & 6 deletions solr/modules/analysis-extras/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ org.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath
org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.curator:curator-client:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-framework:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath
org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpmime:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -114,7 +113,6 @@ org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspat
org.apache.opennlp:opennlp-tools:1.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper-jute:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.carrot2:morfologik-fsa:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.carrot2:morfologik-polish:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.carrot2:morfologik-stemming:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
Expand Down Expand Up @@ -153,14 +151,10 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=apiHelper,jarValidati
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
org.locationtech.spatial4j:spatial4j:0.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.mockito:mockito-core:5.16.1=jarValidation,testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-subclass:5.16.1=jarValidation,testRuntimeClasspath
org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath
org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
org.ow2.asm:asm-commons:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.ow2.asm:asm-tree:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.ow2.asm:asm:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
Expand Down
6 changes: 0 additions & 6 deletions solr/modules/clustering/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLi
org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath
org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -106,7 +105,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,runtimeClasspath,runtimeLi
org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.carrot2:carrot2-core:4.5.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
Expand Down Expand Up @@ -143,11 +141,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtime
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
Expand Down
Loading
Loading