Merge remote-tracking branch 'upstream/main' into fix_remove

opensearch-project · Jan 4, 2024 · 3d29a28 · 3d29a28
2 parents e707b70 + 16d457d
commit 3d29a28
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,7 +57,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Return 409 Conflict HTTP status instead of 503 on failure to concurrently execute snapshots ([#8986](https://github.com/opensearch-project/OpenSearch/pull/5855))
 - Add task completion count in search backpressure stats API ([#10028](https://github.com/opensearch-project/OpenSearch/pull/10028/))
 - Deprecate CamelCase `PathHierarchy` tokenizer name in favor to lowercase `path_hierarchy` ([#10894](https://github.com/opensearch-project/OpenSearch/pull/10894))
-
+- Switched to more reliable OpenSearch Lucene snapshot location([#11728](https://github.com/opensearch-project/OpenSearch/pull/11728))
 
 ### Deprecated
 

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java
@@ -94,7 +94,7 @@ public static void configureRepositories(Project project) {
             String revision = matcher.group(1);
             MavenArtifactRepository luceneRepo = repos.maven(repo -> {
                 repo.setName("lucene-snapshots");
-                repo.setUrl("https://d1nvenhzbhpy0q.cloudfront.net/snapshots/lucene/");
+                repo.setUrl("https://artifacts.opensearch.org/snapshots/lucene/");
             });
             repos.exclusiveContent(exclusiveRepo -> {
                 exclusiveRepo.filter(

diff --git a/gradle/code-coverage.gradle b/gradle/code-coverage.gradle
@@ -13,7 +13,7 @@ repositories {
   gradlePluginPortal()
   // TODO: Find the way to use the repositories from RepositoriesSetupPlugin
   maven {
-    url = "https://d1nvenhzbhpy0q.cloudfront.net/snapshots/lucene/"
+    url = "https://artifacts.opensearch.org/snapshots/lucene/"
   }
 }
 

diff --git a/.../internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java b/.../internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
@@ -1457,6 +1457,13 @@ public void testIndexDeletionDuringSnapshotCreationInQueue() throws Exception {
 
         clusterAdmin().prepareRestoreSnapshot("test-repo", "test-snap").get();
         ensureGreen("test-idx");
+
+        // Wait for snapshot process to complete to prevent conflict with repository clean up
+        assertBusy(() -> {
+            SnapshotInfo snapshotInfo = getSnapshot("test-repo", "test-snap-2");
+            assertTrue(snapshotInfo.state().completed());
+            assertEquals(SnapshotState.PARTIAL, snapshotInfo.state());
+        }, 1, TimeUnit.MINUTES);
     }
 
     private long calculateTotalFilesSize(List<Path> files) {

diff --git a/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java b/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
@@ -615,12 +615,22 @@ public void testTerminateAfterEarlyTermination() throws Exception {
                 assertThat(query.getTimeBreakdown().get("score"), greaterThan(0L));
                 assertThat(query.getTimeBreakdown().get("score_count"), greaterThan(0L));
                 if (executor != null) {
-                    assertThat(query.getTimeBreakdown().get("max_score"), greaterThan(0L));
-                    assertThat(query.getTimeBreakdown().get("min_score"), greaterThan(0L));
-                    assertThat(query.getTimeBreakdown().get("avg_score"), greaterThan(0L));
-                    assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThan(0L));
-                    assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThan(0L));
-                    assertThat(query.getTimeBreakdown().get("avg_score_count"), greaterThan(0L));
+                    long maxScore = query.getTimeBreakdown().get("max_score");
+                    long minScore = query.getTimeBreakdown().get("min_score");
+                    long avgScore = query.getTimeBreakdown().get("avg_score");
+                    long maxScoreCount = query.getTimeBreakdown().get("max_score_count");
+                    long minScoreCount = query.getTimeBreakdown().get("min_score_count");
+                    long avgScoreCount = query.getTimeBreakdown().get("avg_score_count");
+                    assertThat(maxScore, greaterThan(0L));
+                    assertThat(minScore, greaterThanOrEqualTo(0L));
+                    assertThat(avgScore, greaterThanOrEqualTo(0L));
+                    assertThat(maxScore, greaterThanOrEqualTo(avgScore));
+                    assertThat(avgScore, greaterThanOrEqualTo(minScore));
+                    assertThat(maxScoreCount, greaterThan(0L));
+                    assertThat(minScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(maxScoreCount, greaterThanOrEqualTo(avgScoreCount));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(minScoreCount));
                 }
                 assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));
                 assertThat(query.getTimeBreakdown().get("create_weight_count"), equalTo(1L));
@@ -744,30 +754,50 @@ public void testTerminateAfterEarlyTermination() throws Exception {
                 assertThat(query.getProfiledChildren().get(0).getTime(), greaterThan(0L));
                 assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("create_weight"), greaterThan(0L));
                 assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("create_weight_count"), equalTo(1L));
-                assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score"), greaterThan(0L));
-                assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score_count"), greaterThan(0L));
+                assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score"), greaterThanOrEqualTo(0L));
+                assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score_count"), greaterThanOrEqualTo(0L));
                 if (executor != null) {
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score_count"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score_count"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score_count"), greaterThan(0L));
+                    long maxScore = query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score");
+                    long minScore = query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score");
+                    long avgScore = query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score");
+                    long maxScoreCount = query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score_count");
+                    long minScoreCount = query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score_count");
+                    long avgScoreCount = query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score_count");
+                    assertThat(maxScore, greaterThanOrEqualTo(0L));
+                    assertThat(minScore, greaterThanOrEqualTo(0L));
+                    assertThat(avgScore, greaterThanOrEqualTo(0L));
+                    assertThat(maxScore, greaterThanOrEqualTo(avgScore));
+                    assertThat(avgScore, greaterThanOrEqualTo(minScore));
+                    assertThat(maxScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(minScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(maxScoreCount, greaterThanOrEqualTo(avgScoreCount));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(minScoreCount));
                 }
 
                 assertThat(query.getProfiledChildren().get(1).getQueryName(), equalTo("TermQuery"));
                 assertThat(query.getProfiledChildren().get(1).getTime(), greaterThan(0L));
                 assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("create_weight"), greaterThan(0L));
                 assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("create_weight_count"), equalTo(1L));
-                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score"), greaterThan(0L));
-                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score_count"), greaterThan(0L));
+                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score"), greaterThanOrEqualTo(0L));
+                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score_count"), greaterThanOrEqualTo(0L));
                 if (executor != null) {
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score_count"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score_count"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score_count"), greaterThan(0L));
+                    long maxScore = query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score");
+                    long minScore = query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score");
+                    long avgScore = query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score");
+                    long maxScoreCount = query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score_count");
+                    long minScoreCount = query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score_count");
+                    long avgScoreCount = query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score_count");
+                    assertThat(maxScore, greaterThanOrEqualTo(0L));
+                    assertThat(minScore, greaterThanOrEqualTo(0L));
+                    assertThat(avgScore, greaterThanOrEqualTo(0L));
+                    assertThat(maxScore, greaterThanOrEqualTo(avgScore));
+                    assertThat(avgScore, greaterThanOrEqualTo(minScore));
+                    assertThat(maxScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(minScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(maxScoreCount, greaterThanOrEqualTo(avgScoreCount));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(minScoreCount));
                 }
             }, collector -> {
                 assertThat(collector.getReason(), equalTo("search_terminate_after_count"));