fixes

Author: hmottestad

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

@@ -260,7 +260,8 @@ private QueryPressureState refreshState(String reason, Configuration configurati
 		QueryPressureState previous = currentState;
 		long now = clock.getAsLong();
 
-		if (next.ordinal() < previous.ordinal() && now - lastTransition.getTimestampMillis() < recoveryCooldownMs) {
+		if (configuration.isEnabled() && next.ordinal() < previous.ordinal()
+				&& now - lastTransition.getTimestampMillis() < recoveryCooldownMs) {
 			next = previous;
 		}
 
@@ -270,7 +271,7 @@ private QueryPressureState refreshState(String reason, Configuration configurati
 			LOGGER.info(
 					"Query circuit breaker transition previous={} current={} freeMb={} rollingGcMs={} reason={}",
 					previous, next, snapshot.getFreeMemoryMb(), snapshot.getRollingGcMs(), reason);
-			if (!isCheckpointReason(reason) && !isMonitorReason(reason)
+			if (!isCheckpointReason(reason) && !isMonitorReason(reason) && !isStatusReason(reason)
 					&& shouldRequestTransitionGc(currentState, configuration, snapshot)) {
 				maybeRunCheckpointGc();
 			}
@@ -320,6 +321,10 @@ private boolean isMonitorReason(String reason) {
 		return "monitor".equals(reason);
 	}
 
+	private boolean isStatusReason(String reason) {
+		return "status".equals(reason);
+	}
+
 	private boolean shouldRequestTransitionGc(QueryPressureState state, Configuration configuration,
 			QueryPressureMonitor.Snapshot snapshot) {
 		return state == QueryPressureState.HIGH

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

@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.jupiter.api.Test;
 
@@ -117,6 +118,42 @@ void shouldDisableHeavyOperatorExecutionOnlyWhileCritical() throws Exception {
 		assertTrue(readHeavyOperatorExecutionEnabled());
 	}
 
+	@Test
+	void shouldClearCriticalKillSwitchImmediatelyWhenBreakerIsDisabled() throws Exception {
+		Fixture fixture = new Fixture();
+		AtomicReference<QueryCircuitBreaker.Configuration> configuration = new AtomicReference<>(
+				configuration(true, 100, 200, 300, 400, 300, 200, 25, 10, 1000, 7));
+		QueryCircuitBreaker breaker = new QueryCircuitBreaker(fixture.monitor, configuration::get, fixture.clock::get,
+				fixture.sleeps::add, () -> {
+				}, 1000, 1, false);
+
+		try {
+			fixture.freeMemoryMb.set(150);
+			assertEquals("CRITICAL", breaker.snapshotStatus().getState());
+			assertFalse(readHeavyOperatorExecutionEnabled());
+
+			configuration.set(configuration(false, 100, 200, 300, 400, 300, 200, 25, 10, 1000, 7));
+
+			assertEquals("NORMAL", breaker.snapshotStatus().getState());
+			assertTrue(readHeavyOperatorExecutionEnabled());
+		} finally {
+			QueryExecutionContext.setHeavyOperatorExecutionEnabled(true);
+			QueryExecutionContext.setIgnoreCheckpointStride(false);
+		}
+	}
+
+	@Test
+	void shouldNotRunGcFromStatusSnapshotTransition() {
+		Fixture fixture = new Fixture();
+		QueryCircuitBreaker breaker = fixture.breaker(configuration(true, 100, 200, 300, 400, 300, 200, 25, 10, 1000,
+				7), 1000, () -> fixture.gcInvocations.add(fixture.clock.get()));
+
+		fixture.freeMemoryMb.set(250);
+
+		assertEquals("HIGH", breaker.snapshotStatus().getState());
+		assertEquals(List.of(), fixture.gcInvocations);
+	}
+
 	@Test
 	void shouldNotLeaveCurrentThreadInterruptedWhenSelfCancelling() {
 		QueryCircuitBreakerHandle handle = new QueryCircuitBreakerHandle("self-cancel",