From d41610beb995ee35639ef832c23d4b692ac4cc3f Mon Sep 17 00:00:00 2001 From: Tao Liu <33105471+Flyingliuhub@users.noreply.github.com> Date: Fri, 9 Sep 2022 12:46:30 -0700 Subject: [PATCH] [1.3-healthcheck] Cherry-pick the healthcheck bug fixes #2277 (#2306) * [BUG] fix healthcheck logic to expect object and return ids (#2277) (#2300) (#2301) Original implementation incorrectly assumed the return list of nodes was an object array. This PR: https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2232 Addressed the return but didn't catch the nodes.find in the return which is a function for an array. Also, refactors to return a list of node_ids because the original implementation indicated that it should but it can return node ids but it never did. It only returned `null` or `_local`, the problem with this approach is that it doesn't expect valid node version with different DIs or filter out nodes when we pass `null` as the node ID for the node info call because it was fan out the request to all nodes. Now this function will return `_local` if all the nodes share the same cluster_id using a greedy approach since we can assume it is all the same version. Will return node ids, if the cluster_id are different so it will pass a CSV to the node info call and return the info for those nodes. And null if no cluster_id is present, ie, fan out the response. Original issue: https://github.com/opensearch-project/OpenSearch-Dashboards/issues/2203 Signed-off-by: Kawika Avilla Signed-off-by: Kawika Avilla (cherry picked from commit e10ba342c7cb813c57e267e640d35802ece1f235) Co-authored-by: Kawika Avilla * change version Signed-off-by: Tao liu Signed-off-by: Tao liu Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Kawika Avilla --- package.json | 2 +- .../ensure_opensearch_version.test.ts | 32 +++++---- .../ensure_opensearch_version.ts | 68 +++++++++---------- 3 files changed, 54 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index 145bfcea37bb..a2e5545c8712 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "dashboarding" ], "private": true, - "version": "1.3.5", + "version": "1.3.2", "branch": "1.3", "types": "./opensearch_dashboards.d.ts", "tsdocMetadata": "./build/tsdoc-metadata.json", diff --git a/src/core/server/opensearch/version_check/ensure_opensearch_version.test.ts b/src/core/server/opensearch/version_check/ensure_opensearch_version.test.ts index 99e24f192187..a4c8fb74f69b 100644 --- a/src/core/server/opensearch/version_check/ensure_opensearch_version.test.ts +++ b/src/core/server/opensearch/version_check/ensure_opensearch_version.test.ts @@ -254,18 +254,18 @@ describe('pollOpenSearchNodesVersion', () => { it('returns compatibility results and isCompatible=true with filters', (done) => { expect.assertions(2); const target = { - id: '0', + cluster_id: '0', attribute: 'foo', }; const filter = { - id: '1', + cluster_id: '1', attribute: 'bar', }; // will filter out every odd index const nodes = createNodesWithAttribute( - target.id, - filter.id, + target.cluster_id, + filter.cluster_id, target.attribute, filter.attribute, '5.1.0', @@ -274,6 +274,10 @@ describe('pollOpenSearchNodesVersion', () => { '5.1.1-Beta1' ); + const filteredNodes = nodes; + delete filteredNodes.nodes['node-1']; + delete filteredNodes.nodes['node-3']; + // @ts-expect-error we need to return an incompatible type to use the testScheduler here internalClient.cluster.state.mockReturnValueOnce({ body: nodes }); @@ -281,7 +285,7 @@ describe('pollOpenSearchNodesVersion', () => { pollOpenSearchNodesVersion({ internalClient, - optimizedHealthcheck: { id: target.id, filters: { custom_attribute: filter.attribute } }, + optimizedHealthcheck: { id: 'cluster_id', filters: { custom_attribute: filter.attribute } }, opensearchVersionCheckInterval: 1, ignoreVersionMismatch: false, opensearchDashboardsVersion: OPENSEARCH_DASHBOARDS_VERSION, @@ -291,7 +295,7 @@ describe('pollOpenSearchNodesVersion', () => { .subscribe({ next: (result) => { expect(result).toEqual( - mapNodesVersionCompatibility(nodes, OPENSEARCH_DASHBOARDS_VERSION, false) + mapNodesVersionCompatibility(filteredNodes, OPENSEARCH_DASHBOARDS_VERSION, false) ); expect(result.isCompatible).toBe(true); }, @@ -303,18 +307,18 @@ describe('pollOpenSearchNodesVersion', () => { it('returns compatibility results and isCompatible=false with filters', (done) => { expect.assertions(2); const target = { - id: '0', + cluster_id: '0', attribute: 'foo', }; const filter = { - id: '1', + cluster_id: '1', attribute: 'bar', }; // will filter out every odd index const nodes = createNodesWithAttribute( - target.id, - filter.id, + target.cluster_id, + filter.cluster_id, target.attribute, filter.attribute, '5.1.0', @@ -323,6 +327,10 @@ describe('pollOpenSearchNodesVersion', () => { '5.1.1-Beta1' ); + const filteredNodes = nodes; + delete filteredNodes.nodes['node-1']; + delete filteredNodes.nodes['node-3']; + // @ts-expect-error we need to return an incompatible type to use the testScheduler here internalClient.cluster.state.mockReturnValueOnce({ body: nodes }); @@ -330,7 +338,7 @@ describe('pollOpenSearchNodesVersion', () => { pollOpenSearchNodesVersion({ internalClient, - optimizedHealthcheck: { id: target.id, filters: { custom_attribute: filter.attribute } }, + optimizedHealthcheck: { id: 'cluster_id', filters: { custom_attribute: filter.attribute } }, opensearchVersionCheckInterval: 1, ignoreVersionMismatch: false, opensearchDashboardsVersion: OPENSEARCH_DASHBOARDS_VERSION, @@ -340,7 +348,7 @@ describe('pollOpenSearchNodesVersion', () => { .subscribe({ next: (result) => { expect(result).toEqual( - mapNodesVersionCompatibility(nodes, OPENSEARCH_DASHBOARDS_VERSION, false) + mapNodesVersionCompatibility(filteredNodes, OPENSEARCH_DASHBOARDS_VERSION, false) ); expect(result.isCompatible).toBe(false); }, diff --git a/src/core/server/opensearch/version_check/ensure_opensearch_version.ts b/src/core/server/opensearch/version_check/ensure_opensearch_version.ts index 04fb20a988e1..09938aae34f7 100644 --- a/src/core/server/opensearch/version_check/ensure_opensearch_version.ts +++ b/src/core/server/opensearch/version_check/ensure_opensearch_version.ts @@ -37,7 +37,6 @@ import { timer, of, from, Observable } from 'rxjs'; import { map, distinctUntilChanged, catchError, exhaustMap, mergeMap } from 'rxjs/operators'; -import { get } from 'lodash'; import { ApiResponse } from '@elastic/elasticsearch'; import { opensearchVersionCompatibleWithOpenSearchDashboards, @@ -51,67 +50,66 @@ import type { OpenSearchClient } from '../client'; * that is supplied through the healthcheck param. This node attribute is configurable * in opensearch_dashboards.yml. It can also filter attributes out by key-value pair. * If all nodes have the same cluster id then we do not fan out the healthcheck and use '_local' node - * If there are multiple cluster ids then we use the default fan out behavior + * If there are multiple cluster ids then we return an array of node ids to check. * If the supplied node attribute is missing then we return null and use default fan out behavior * @param {OpenSearchClient} internalClient * @param {OptimizedHealthcheck} healthcheck - * @returns {string|null} '_local' if all nodes have the same cluster_id, otherwise null + * @returns {string|string[]|null} '_local' if all nodes have the same cluster_id, array of node ids if different cluster_id, null if no cluster_id or nodes returned */ export const getNodeId = async ( internalClient: OpenSearchClient, healthcheck: OptimizedHealthcheck -): Promise => { +): Promise<'_local' | string[] | null> => { try { + // If missing an id, we have nothing to check + if (!healthcheck.id) return null; + let path = `nodes.*.attributes.${healthcheck.id}`; const filters = healthcheck.filters; - if (filters) { - Object.keys(filters).forEach((key) => { - path += `,nodes.*.attributes.${key}`; - }); + const filterKeys = filters ? Object.keys(filters) : []; + + for (const key of filterKeys) { + path += `,nodes.*.attributes.${key}`; } + /* + * Using _cluster/state/nodes to retrieve the cluster_id of each node from cluster manager node which + * is considered to be a lightweight operation to aggegrate different cluster_ids from the OpenSearch nodes. + */ const state = (await internalClient.cluster.state({ metric: 'nodes', filter_path: [path], })) as ApiResponse; - /* Aggregate different cluster_ids from the OpenSearch nodes - * if all the nodes have the same cluster_id, retrieve nodes.info from _local node only - * Using _cluster/state/nodes to retrieve the cluster_id of each node from master node which is considered to be a lightweight operation - * else if the nodes have different cluster_ids then fan out the request to all nodes - * else there are no nodes in the cluster - */ + const nodes = state.body.nodes; - let nodeIds = Object.keys(nodes); - if (nodeIds.length === 0) { - return null; - } + const nodeIds = new Set(Object.keys(nodes)); /* * If filters are set look for the key and value and filter out any node that matches * the value for that attribute. */ - if (filters) { - nodeIds.forEach((id) => { - Object.keys(filters).forEach((key) => { - const attributeValue = get(nodes[id], `attributes.${key}`, null); - if (attributeValue === filters[key]) { - delete nodes[id]; - } - }); - }); + for (const id of nodeIds) { + for (const key of filterKeys) { + const attributeValue = nodes[id].attributes?.[key] ?? null; - nodeIds = Object.keys(nodes); - if (nodeIds.length === 0) { - return null; + if (attributeValue === filters![key]) nodeIds.delete(id); } } - const sharedClusterId = get(nodes[nodeIds[0]], `attributes.${healthcheck.id}`, null); + if (nodeIds.size === 0) return null; + + const [firstNodeId] = nodeIds; + const sharedClusterId = nodes[firstNodeId].attributes?.[healthcheck.id] ?? null; + // If cluster_id is not set then fan out + if (sharedClusterId === null) return null; + + // If a node is found to have a different cluster_id, return node ids + for (const id of nodeIds) { + if (nodes[id].attributes?.[healthcheck.id] !== sharedClusterId) return Array.from(nodeIds); + } - return sharedClusterId === null || - nodes.find((node: any) => sharedClusterId !== get(node, `attributes.${healthcheck.id}`, null)) - ? null - : '_local'; + // When all nodes share the same cluster_id, return _local + return '_local'; } catch (e) { return null; }