Merge branch 'main' into main

Author: romulets

qa/vector/src/main/java/org/elasticsearch/test/knn/CmdLineArgs.java

@@ -87,7 +87,7 @@ static CmdLineArgs fromXContent(XContentParser parser) throws IOException {
         return builder.build();
     }
 
-    static final ObjectParser<CmdLineArgs.Builder, Void> PARSER = new ObjectParser<>("cmd_line_args", true, Builder::new);
+    static final ObjectParser<CmdLineArgs.Builder, Void> PARSER = new ObjectParser<>("cmd_line_args", false, Builder::new);
 
     static {
         PARSER.declareStringArray(Builder::setDocVectors, DOC_VECTORS_FIELD);

qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexer.java

@@ -270,9 +270,11 @@ public void run() {
 
         private void _run() throws IOException {
             while (true) {
-                int id = numDocsIndexed.getAndIncrement();
-                if (id >= numDocsToIndex) {
+                int id = numDocsIndexed.get();
+                if (id == numDocsToIndex) {
                     break;
+                } else if (numDocsIndexed.compareAndSet(id, id + 1) == false) {
+                    continue;
                 }
 
                 Document doc = new Document();