improved detection and monitoring

Author: hmottestad

core/http/client/src/main/java/org/eclipse/rdf4j/http/client/QueryCircuitBreaker.java

@@ -260,6 +260,7 @@ private QueryPressureState refreshState(String reason, Configuration configurati
 				System.gc();
 			}
 		}
+		QueryExecutionContext.setIgnoreCheckpointStride(currentState != QueryPressureState.NORMAL);
 		QueryExecutionContext.setHeavyOperatorExecutionEnabled(currentState != QueryPressureState.CRITICAL);
 		return currentState;
 	}

core/http/client/src/main/java/org/eclipse/rdf4j/http/client/QueryExecutionContext.java

@@ -89,6 +89,10 @@ static void setHeavyOperatorExecutionEnabled(boolean heavyOperatorExecutionEnabl
 		QueryExecutionContext.heavyOperatorExecutionEnabled = heavyOperatorExecutionEnabled;
 	}
 
+	static void setIgnoreCheckpointStride(boolean ignoreCheckpointStride) {
+		QueryExecutionContext.ignoreCheckpointStride = ignoreCheckpointStride;
+	}
+
 	public interface Activation extends AutoCloseable {
 		@Override
 		void close();

core/http/client/src/test/java/org/eclipse/rdf4j/http/client/QueryCircuitBreakerTest.java

@@ -107,6 +107,23 @@ void shouldDisableHeavyOperatorExecutionOnlyWhileCritical() throws Exception {
 		assertTrue(readHeavyOperatorExecutionEnabled());
 	}
 
+	@Test
+	void shouldIgnoreCheckpointStrideOutsideNormalState() throws Exception {
+		Fixture fixture = new Fixture();
+		QueryCircuitBreaker breaker = fixture.breaker(configuration(true, 100, 200, 300, 400, 300, 200, 25, 10, 0,
+				7), 0);
+
+		assertFalse(readIgnoreCheckpointStride());
+
+		fixture.freeMemoryMb.set(350);
+		assertEquals("WARN", breaker.snapshotStatus().getState());
+		assertTrue(readIgnoreCheckpointStride());
+
+		fixture.freeMemoryMb.set(1024);
+		assertEquals("NORMAL", breaker.snapshotStatus().getState());
+		assertFalse(readIgnoreCheckpointStride());
+	}
+
 	@Test
 	void shouldTransitionAcrossPressureLevelsUsingFreeMemoryThresholds() {
 		Fixture fixture = new Fixture();
@@ -328,6 +345,12 @@ private static boolean readHeavyOperatorExecutionEnabled() throws Exception {
 		return field.getBoolean(null);
 	}
 
+	private static boolean readIgnoreCheckpointStride() throws Exception {
+		Field field = QueryExecutionContext.class.getDeclaredField("ignoreCheckpointStride");
+		field.setAccessible(true);
+		return field.getBoolean(null);
+	}
+
 	private static Set<Long> threadIds(String threadName) {
 		Set<Long> ids = new HashSet<>();
 		for (Thread thread : Thread.getAllStackTraces().keySet()) {