Merge pull request #4200 from vespa-engine/geirst/ecommerce-refeed-wi…

…th-queries Benchmark refeed and refeed with queries separately.
vespa-engine · Sep 17, 2024 · eaf95a9 · eaf95a9
2 parents f2a39a1 + 2180a8c
commit eaf95a9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search.rb b/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search.rb
@@ -22,11 +22,13 @@ def test_hybrid_search
     benchmark_queries("after_flush", false, [1, 2, 4, 8, 16, 32, 64])
     benchmark_queries("after_flush", true, [1, 16, 64])
 
-    feed_thread = Thread.new { benchmark_feed(feed_file_name, "refeed") }
-    sleep 5
-    benchmark_queries("during_refeed", false, [1, 16, 64])
-    feed_thread.join
+    benchmark_feed(feed_file_name, "refeed")
     benchmark_feed("vespa_update-1M.json.zst", "update")
+
+    feed_thread = Thread.new { benchmark_feed(feed_file_name, "refeed_with_queries") }
+    sleep 2
+    benchmark_queries("during_refeed", false, [1, 16, 64], {:runtime => 9})
+    feed_thread.join
   end
 
   def feed_file_name

diff --git a/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search_es.rb b/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search_es.rb
@@ -19,11 +19,14 @@ def test_hybrid_search
     dump_jvm_stats
     benchmark_queries("after_feed", false, [1, 2, 4, 8, 16, 32, 64])
     benchmark_queries("after_feed", true, [1, 16, 64])
-    feed_thread = Thread.new { benchmark_feed(feed_file_name, get_num_docs, @feed_threads, "refeed") }
-    sleep 5
-    benchmark_queries("during_refeed", false, [1, 16, 64])
-    feed_thread.join
+
+    benchmark_feed(feed_file_name, get_num_docs, @feed_threads, "refeed")
     benchmark_update("es_update-1M.json.zst", get_num_docs, @feed_threads)
+
+    feed_thread = Thread.new { benchmark_feed(feed_file_name, get_num_docs, @feed_threads, "refeed_with_queries") }
+    sleep 2
+    benchmark_queries("during_refeed", false, [1, 16, 64], {:runtime => 9})
+    feed_thread.join
   end
 
   def teardown

diff --git a/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search_es_merge_1.rb b/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search_es_merge_1.rb
@@ -19,6 +19,7 @@ def test_hybrid_search
     benchmark_force_merge(get_num_docs, 1)
     dump_jvm_stats
     benchmark_queries("after_merge", false, [1, 2, 4, 8, 16, 32, 64])
+    benchmark_queries("after_merge", true, [1, 16, 64])
   end
 
   def teardown

diff --git a/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search_es_merge_8.rb b/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search_es_merge_8.rb
@@ -18,6 +18,7 @@ def test_hybrid_search
     benchmark_feed(feed_file_name, get_num_docs, @feed_threads, "feed")
     benchmark_force_merge(get_num_docs, 8)
     benchmark_queries("after_merge", false, [1, 2, 4, 8, 16, 32, 64])
+    benchmark_queries("after_merge", true, [1, 16, 64])
   end
 
   def teardown