Fix InternalAutoDateHistogram reproducible failure

server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilder.java

@@ -156,7 +156,7 @@ public int getNumBuckets() {
  return new AutoDateHistogramAggregatorFactory(name, config, numBuckets, roundings, context, parent, subFactoriesBuilder, metaData);
  }
 
- private static Rounding createRounding(DateTimeUnit interval, DateTimeZone timeZone) {
+ static Rounding createRounding(DateTimeUnit interval, DateTimeZone timeZone) {
  Rounding.Builder tzRoundingBuilder = Rounding.builder(interval);
  if (timeZone != null) {
  tzRoundingBuilder.timeZone(timeZone);

server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalAutoDateHistogram.java

@@ -418,7 +418,7 @@ private BucketReduceResult addEmptyBuckets(BucketReduceResult currentResult, Red
  return currentResult;
  }
  int roundingIdx = getAppropriateRounding(list.get(0).key, list.get(list.size() - 1).key, currentResult.roundingIdx,
- bucketInfo.roundingInfos);
+ bucketInfo.roundingInfos, targetBuckets);
  RoundingInfo roundingInfo = bucketInfo.roundingInfos[roundingIdx];
  Rounding rounding = roundingInfo.rounding;
  // merge buckets using the new rounding
@@ -447,8 +447,8 @@ private BucketReduceResult addEmptyBuckets(BucketReduceResult currentResult, Red
  return new BucketReduceResult(list, roundingInfo, roundingIdx);
  }
 
- private int getAppropriateRounding(long minKey, long maxKey, int roundingIdx,
- RoundingInfo[] roundings) {
+ static int getAppropriateRounding(long minKey, long maxKey, int roundingIdx,
+ RoundingInfo[] roundings, int targetBuckets) {
  if (roundingIdx == roundings.length - 1) {
  return roundingIdx;
  }
@@ -480,7 +480,7 @@ private int getAppropriateRounding(long minKey, long maxKey, int roundingIdx,
  currentKey = currentRounding.nextRoundingValue(currentKey);
  }
  currentRoundingIdx++;
- } while (requiredBuckets > (targetBuckets * roundings[roundingIdx].getMaximumInnerInterval())
+  } while (requiredBuckets > (targetBuckets * roundings[currentRoundingIdx-1].getMaximumInnerInterval())
  && currentRoundingIdx < roundings.length);
  // The loop will increase past the correct rounding index here so we
  // need to subtract one to get the rounding index we need

server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java

@@ -20,6 +20,7 @@
 package org.elasticsearch.search.aggregations.bucket.histogram;
 
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.rounding.DateTimeUnit;
 import org.elasticsearch.search.DocValueFormat;
 import org.elasticsearch.search.aggregations.InternalAggregations;
 import org.elasticsearch.search.aggregations.ParsedMultiBucketAggregation;
@@ -28,7 +29,11 @@
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
 import org.elasticsearch.test.InternalMultiBucketAggregationTestCase;
 import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
 
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -39,6 +44,8 @@
 import static org.elasticsearch.common.unit.TimeValue.timeValueHours;
 import static org.elasticsearch.common.unit.TimeValue.timeValueMinutes;
 import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds;
+import static org.elasticsearch.search.aggregations.bucket.histogram.AutoDateHistogramAggregationBuilder.createRounding;
+import static org.hamcrest.Matchers.equalTo;
 
 public class InternalAutoDateHistogramTests extends InternalMultiBucketAggregationTestCase<InternalAutoDateHistogram> {
 
@@ -77,6 +84,22 @@ protected InternalAutoDateHistogram createTestInstance(String name,
  return new InternalAutoDateHistogram(name, buckets, targetBuckets, bucketInfo, format, pipelineAggregators, metaData);
  }
 
+ public void testGetAppropriateRounding() {
+ RoundingInfo[] roundings = new RoundingInfo[6];
+ DateTimeZone timeZone = DateTimeZone.UTC;
+ roundings[0] = new RoundingInfo(createRounding(DateTimeUnit.SECOND_OF_MINUTE, timeZone),
+ 1000L, 1000);
+ roundings[1] = new RoundingInfo(createRounding(DateTimeUnit.MINUTES_OF_HOUR, timeZone),
+ 60 * 1000L, 1, 5, 10, 30);
+ roundings[2] = new RoundingInfo(createRounding(DateTimeUnit.HOUR_OF_DAY, timeZone),
+ 60 * 60 * 1000L, 1, 3, 12);
+
+ OffsetDateTime timestamp = Instant.parse("2018-01-01T00:00:01.000Z").atOffset(ZoneOffset.UTC);
+ int result = InternalAutoDateHistogram.getAppropriateRounding(timestamp.toEpochSecond()*1000,
+ timestamp.plusDays(1).toEpochSecond()*1000, 0, roundings, 25);
+ assertThat(result, equalTo(2));
+ }
+
  @Override
  protected void assertReduced(InternalAutoDateHistogram reduced, List<InternalAutoDateHistogram> inputs) {
  int roundingIdx = 0;
@@ -100,9 +123,11 @@ protected void assertReduced(InternalAutoDateHistogram reduced, List<InternalAut
  }
  }
  }
+
  long normalizedDuration = (highest - lowest) / roundingInfo.getRoughEstimateDurationMillis();
  long innerIntervalToUse = 0;
- for (int interval : roundingInfo.innerIntervals) {
+ for (int j = roundingInfo.innerIntervals.length-1; j >= 0; j--) {
+ int interval = roundingInfo.innerIntervals[j];
  if (normalizedDuration / interval < maxNumberOfBuckets()) {
  innerIntervalToUse = interval;
  }
@@ -137,12 +162,6 @@ protected void assertReduced(InternalAutoDateHistogram reduced, List<InternalAut
  assertEquals(expectedCounts, actualCounts);
  }
 
- @Override
- @AwaitsFix(bugUrl = "https:/elastic/elasticsearch/issues/32215")
- public void testReduceRandom() {
- super.testReduceRandom();
- }
-
  @Override
  protected Writeable.Reader<InternalAutoDateHistogram> instanceReader() {
  return InternalAutoDateHistogram::new;