alksdjf

Author: limotova

server/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java

@@ -201,8 +201,8 @@ private long limit(long bytes, String label, double overheadConstant, long memor
     @Override
     public void addWithoutBreaking(long bytes) {
         long u = used.addAndGet(bytes);
+        logger.warn("[{}] Adjusted breaker by [{}] bytes, now [{}]", this.name, bytes, u);
         if (logger.isTraceEnabled()) {
-            logger.trace("[{}] Adjusted breaker by [{}] bytes, now [{}]", this.name, bytes, u);
         }
         assert u >= 0 : "Used bytes: [" + u + "] must be >= 0";
     }

x-pack/plugin/esql/qa/server/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/multi_node/GenerativeIT.java

@@ -7,10 +7,13 @@
 
 package org.elasticsearch.xpack.esql.qa.multi_node;
 
+import com.carrotsearch.randomizedtesting.annotations.Seed;
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
 
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.test.TestClustersThreadFilter;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
+import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.xpack.esql.qa.rest.generative.GenerativeRestTest;
 import org.junit.ClassRule;
 
@@ -35,6 +38,17 @@ protected String getTestRestCluster() {
         return cluster.getHttpAddresses();
     }
 
+    @Override
+    protected final Settings restClientSettings() {
+        return Settings.builder()
+            .put(super.restClientSettings())
+            // increase the timeout here to 90 seconds to handle long waits for a green
+            // cluster health. the waits for green need to be longer than a minute to
+            // account for delayed shards
+            .put(ESRestTestCase.CLIENT_SOCKET_TIMEOUT, "10h")
+            .build();
+    }
+
     @Override
     protected boolean supportsSourceFieldMapping() {
         return false;