Disable concurrent aggs for Diversified Sampler and Sampler aggs

[jed326]

Description

Disable concurrent aggs for Diversified Sampler and Sampler aggs. See #11075 (comment) for more details.

Related Issues

Resolves #10046
Resolves #10893
Resolves #10822

Check List

• New functionality includes testing.
  • All tests pass
• New functionality has been documented.
  • New functionality has javadoc added
• Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
• Commits are signed per the DCO using --signoff
• Commit changes are listed out in CHANGELOG.md file (See: Changelog)
• Public documentation issue/PR created

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

[github-actions]

Compatibility status:

Checks if related components are compatible with change 8e63dcc

Incompatible components

Incompatible components: [https://github.com/opensearch-project/performance-analyzer.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/neural-search.git]

[jed326]

@reta @sohami could you please help review this? Thanks!

[github-actions]

Gradle Check (Jenkins) Run Completed with:

• RESULT: UNSTABLE ❕
• TEST FAILURES:

      2 org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.testIndexCreateBlockIsRemovedWhenAnyNodesNotExceedHighWatermarkWithAutoReleaseEnabled
      1 org.opensearch.remotestore.RemoteStoreStatsIT.testDownloadStatsCorrectnessSinglePrimaryMultipleReplicaShards

• URL: https://build.ci.opensearch.org/job/gradle-check/29528/
• CommitID: 8e63dcc
  Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

[codecov]

Codecov Report

Merging #11087 (e122ba5) into main (c851b34) will increase coverage by 0.03%.
Report is 2 commits behind head on main.
The diff coverage is 40.00%.

@@             Coverage Diff              @@
##               main   #11087      +/-   ##
============================================
+ Coverage     71.19%   71.23%   +0.03%     
- Complexity    58759    58773      +14     
============================================
  Files          4872     4872              
  Lines        276780   276773       -7     
  Branches      40241    40240       -1     
============================================
+ Hits         197061   197156      +95     
+ Misses        63331    63212     -119     
- Partials      16388    16405      +17     

Files	Coverage Δ
...h/cluster/metadata/MetadataCreateIndexService.java	80.10% <ø> (-0.04%)	⬇️
...rg/opensearch/common/settings/ClusterSettings.java	92.85% <ø> (ø)
...in/java/org/opensearch/indices/IndicesService.java	71.40% <ø> (+1.10%)	⬆️
...s/replication/SegmentReplicationTargetService.java	56.17% <66.66%> (ø)
...s/bucket/sampler/DiversifiedAggregatorFactory.java	76.00% <0.00%> (ø)
...tions/bucket/sampler/SamplerAggregatorFactory.java	80.00% <0.00%> (ø)

... and 451 files with indirect coverage changes

[github-actions]

Gradle Check (Jenkins) Run Completed with:

• RESULT: UNSTABLE ❕
• TEST FAILURES:

      1 org.opensearch.repositories.azure.AzureBlobContainerRetriesTests.testWriteLargeBlob
      1 org.opensearch.cluster.allocation.ClusterRerouteIT.testDelayWithALargeAmountOfShards

• URL: https://build.ci.opensearch.org/job/gradle-check/29529/
• CommitID: e122ba5
  Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

[opensearch-trigger-bot]

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-11087-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1130d656a64a3c8e7476c5776b9e6c9efe937255
# Push it to GitHub
git push --set-upstream origin backport/backport-11087-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-11087-to-2.x.

[reta]

@jed326 please send manual backport to 2.x, thank you

[jed326]

@reta could you help merge #11050 first? That backport needs to be merged before this one else there will be a merge conflict. I'll send out the manual backport PR as soon as that one is merged. Thanks!

[reta]

That backport needs to be merged before this one else there will be a merge conflict. I'll send out the manual backport PR as soon as that one is merged. Thanks!

Sorry about the delay @jed326 , it seems like @peternied just merged it