kuzzle 2.60.0-beta.5 → 2.60.0-beta.6

package/dist/lib/service/storage/7/elasticsearch.d.ts

@@ -468,6 +468,12 @@ export declare class ES7 {
      * collection waits for its shards (`wait_for_active_shards`); a node that
      * finds it already there calls this instead. It answers at once when the
      * shards are already active.
+     *
+     * A `yellow` status alone does not wait: Elasticsearch reports a new index
+     * whose primaries are still initializing as `yellow` (#3074). Asking for as
+     * many active shard copies as the index has primaries does, and, unlike
+     * `wait_for_no_initializing_shards`, does not also wait for replicas that
+     * are recovering, which a collection with data may take longer to do.
      */
     waitForCollectionShards(index: string, collection: string, timeout?: string): Promise<void>;
     /**

package/dist/lib/service/storage/7/elasticsearch.js

@@ -1214,12 +1214,25 @@ class ES7 {
      * collection waits for its shards (`wait_for_active_shards`); a node that
      * finds it already there calls this instead. It answers at once when the
      * shards are already active.
+     *
+     * A `yellow` status alone does not wait: Elasticsearch reports a new index
+     * whose primaries are still initializing as `yellow` (#3074). Asking for as
+     * many active shard copies as the index has primaries does, and, unlike
+     * `wait_for_no_initializing_shards`, does not also wait for replicas that
+     * are recovering, which a collection with data may take longer to do.
      */
     async waitForCollectionShards(index, collection, timeout = COLLECTION_SHARDS_TIMEOUT) {
+        const alias = this._getAlias(index, collection);
         try {
+            const { body } = await this._client.indices.getSettings({
+                index: alias,
+                name: "index.number_of_shards",
+            });
+            const primaries = Object.values(body)[0]?.settings?.index?.number_of_shards;
             await this._client.cluster.health({
-                index: this._getAlias(index, collection),
+                index: alias,
                 timeout,
+                wait_for_active_shards: String(primaries ?? 1),
                 wait_for_status: "yellow",
             });
         }

package/dist/lib/service/storage/8/elasticsearch.d.ts

@@ -459,6 +459,12 @@ export declare class ES8 {
      * collection waits for its shards (`wait_for_active_shards`); a node that
      * finds it already there calls this instead. It answers at once when the
      * shards are already active.
+     *
+     * A `yellow` status alone does not wait: Elasticsearch reports a new index
+     * whose primaries are still initializing as `yellow` (#3074). Asking for as
+     * many active shard copies as the index has primaries does, and, unlike
+     * `wait_for_no_initializing_shards`, does not also wait for replicas that
+     * are recovering, which a collection with data may take longer to do.
      */
     waitForCollectionShards(index: string, collection: string, timeout?: string): Promise<void>;
     /**

package/dist/lib/service/storage/8/elasticsearch.js

@@ -1236,12 +1236,25 @@ class ES8 {
      * collection waits for its shards (`wait_for_active_shards`); a node that
      * finds it already there calls this instead. It answers at once when the
      * shards are already active.
+     *
+     * A `yellow` status alone does not wait: Elasticsearch reports a new index
+     * whose primaries are still initializing as `yellow` (#3074). Asking for as
+     * many active shard copies as the index has primaries does, and, unlike
+     * `wait_for_no_initializing_shards`, does not also wait for replicas that
+     * are recovering, which a collection with data may take longer to do.
      */
     async waitForCollectionShards(index, collection, timeout = COLLECTION_SHARDS_TIMEOUT) {
+        const alias = this._getAlias(index, collection);
         try {
+            const body = await this._client.indices.getSettings({
+                index: alias,
+                name: "index.number_of_shards",
+            });
+            const primaries = Object.values(body)[0]?.settings?.index?.number_of_shards;
             await this._client.cluster.health({
-                index: this._getAlias(index, collection),
+                index: alias,
                 timeout,
+                wait_for_active_shards: Number(primaries ?? 1),
                 wait_for_status: "yellow",
             });
         }

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "kuzzle",
     "author": "The Kuzzle Team <support@kuzzle.io>",
-    "version": "2.60.0-beta.5",
+    "version": "2.60.0-beta.6",
     "description": "Kuzzle is an open-source solution that handles all the data management through a secured API, with a large choice of protocols.",
     "scripts": {
         "build": "rm -Rf ./dist && tsc && node -r ts-node/register/transpile-only ./bin/copy-binaries.ts",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
-  "version": "2.60.0-beta.5",
+  "version": "2.60.0-beta.6",
   "description": "Kuzzle is an open-source solution that handles all the data management through a secured API, with a large choice of protocols.",
   "scripts": {
     "build": "rm -Rf ./dist && tsc && node -r ts-node/register/transpile-only ./bin/copy-binaries.ts",