Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,19 @@
import static org.apache.phoenix.jdbc.HighAvailabilityPolicy.PARALLEL;
import static org.apache.phoenix.jdbc.HighAvailabilityTestingUtility.HBaseTestingUtilityPair;
import static org.apache.phoenix.jdbc.HighAvailabilityTestingUtility.doTestBasicOperationsWithConnection;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.function.Supplier;
import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.junit.AfterClass;
Expand Down Expand Up @@ -108,9 +111,27 @@ public void testParallelConnectionBackoff() throws Exception {
Future<Connection> futureConnB =
executor.submit(() -> DriverManager.getConnection(jdbcUrl, PROPERTIES));

// The previous call of connection creation should fill the queue by half.
waitFor(() -> !PhoenixHAExecutorServiceProvider.hasCapacity(PROPERTIES).get(0)
&& !PhoenixHAExecutorServiceProvider.hasCapacity(PROPERTIES).get(1), 100, 5000);
// PHOENIX-7859: Poll actual queue state, not the hasCapacity() composite — the multi-step
// calculation (size/capacity < threshold) had a race window. We now check queue.size()
// directly, then verify hasCapacity() matches expectations.
// Note: queueSize >= 1 triggers !hasCapacity() because HA_MAX_QUEUE_SIZE=2 and
// HA_THREADPOOL_QUEUE_BACKOFF_THRESHOLD=0.5, so 1/2 = 0.5 which is NOT < 0.5.
waitFor(() -> {
List<PhoenixHAExecutorServiceProvider.PhoenixHAClusterExecutorServices> services =
PhoenixHAExecutorServiceProvider.get(PROPERTIES);
int queueSize1 = ((ThreadPoolExecutor) services.get(0).getExecutorService()).getQueue().size();
int queueSize2 = ((ThreadPoolExecutor) services.get(1).getExecutorService()).getQueue().size();
Comment on lines +122 to +123

LOG.debug("Waiting for queues to fill: cluster1 queue={}, cluster2 queue={}",
queueSize1, queueSize2);

return queueSize1 >= 1 && queueSize2 >= 1;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If any future change adjusts HA_MAX_QUEUE_SIZE this test may pass when it should fail (the wait completes earlier than the fallback signal actually flips) or fail in confusing ways. Consider deriving the trigger from the configured values, e.g.:

int maxQueue = Integer.parseInt(
    PROPERTIES.getProperty(PhoenixHAExecutorServiceProvider.HA_MAX_QUEUE_SIZE));
double threshold = Double.parseDouble(
    PROPERTIES.getProperty(
        PhoenixHAExecutorServiceProvider.HA_THREADPOOL_QUEUE_BACKOFF_THRESHOLD));
int trigger = (int) Math.ceil(threshold * maxQueue);

... or just keep hasCapacity() as the wait predicate

}, 100, 5000);

// Verify that hasCapacity() now correctly reports no capacity
List<Boolean> capacity = PhoenixHAExecutorServiceProvider.hasCapacity(PROPERTIES);
assertFalse("Cluster 1 should have no capacity after queues filled", capacity.get(0).booleanValue());
assertFalse("Cluster 2 should have no capacity after queues filled", capacity.get(1).booleanValue());
Comment on lines +133 to +134

// This should be backed off now, as the capacity is not available.
Connection connC = DriverManager.getConnection(jdbcUrl, PROPERTIES);
Expand Down