Fix AWS OpenSearch Serverless AOSS support and search cluster stability by aniruddhaadak80 · Pull Request #27618 · open-metadata/OpenMetadata

aniruddhaadak80 · 2026-04-22T08:03:40Z

Description

This PR resolves #27599 by implementing AWS OpenSearch Serverless AOSS detection and search backend stability fixes.

Key Changes

AOSS Detection: Added logic to OpenSearchClient.java to detect AOSS environments via hostname patterns or the SEARCH_AWS_SERVICE_NAME environment variable.
API Gating: Gated unsupported cluster-level API calls like cluster stats and nodes stats in OpenSearchGenericManager.java to prevent spurious error logs in AOSS.
Health Check Optimization: Replaced cluster health calls with client.info() (the GET root endpoint) for AOSS deployments to ensure correct health status reporting.
Null-Safety Improvements: Implemented guards in SearchClusterMetrics.java and SearchIndexClusterValidator.java to handle missing cluster statistics gracefully.
Integration Test Fix: Updated TestCaseResourceIT.java to handle 404 Not Found responses when listing resolution statuses for hard-deleted test cases, improving CI reliability.

… their children

…e copilot reviews

… deserialization errors

… avoid Awaitility timeouts

…s recursive=true for hard delete

…_resolution_statuses

github-actions · 2026-04-22T08:04:05Z

Hi there 👋 Thanks for your contribution!

The OpenMetadata team will review the PR shortly! Once it has been labeled as safe to test, the CI workflows
will start executing and we'll be able to make sure everything is working as expected.

Let us know if you need any help!

gitar-bot · 2026-04-22T08:06:46Z

+      int totalNodes = clusterStats != null && clusterStats.nodes() != null && clusterStats.nodes().count() != null
+          ? clusterStats.nodes().count().total()
+          : 1;
+      int totalShards = clusterStats != null && clusterStats.indices() != null && clusterStats.indices().shards() != null && clusterStats.indices().shards().total() != null
+          ? clusterStats.indices().shards().total().intValue()
+          : 0;

      int maxShardsPerNode = getMaxShardsPerNode(client);


💡 Edge Case: SearchIndexClusterValidator also calls clusterStats but not clusterSettings

In SearchIndexClusterValidator.java, clusterStats is now null-guarded (lines 79-84), but getMaxShardsPerNode(client) is called on line 86. If that method internally calls clusterSettings() or another unsupported AOSS API, it will also fail. Worth verifying that the full code path in this validator is AOSS-safe.

_{Was this helpful? React with 👍 / 👎 | Reply gitar fix to apply this suggestion}

github-actions · 2026-04-22T08:13:19Z

Hi there 👋 Thanks for your contribution!

The OpenMetadata team will review the PR shortly! Once it has been labeled as safe to test, the CI workflows
will start executing and we'll be able to make sure everything is working as expected.

Let us know if you need any help!

gitar-bot · 2026-04-22T08:14:47Z

Code Review 👍 Approved with suggestions 0 resolved / 1 findings

Eliminates spurious error logs in AWS OpenSearch Serverless by handling unsupported /_cluster/stats calls. Please also address the missing clusterSettings validation in SearchIndexClusterValidator.

💡 Edge Case: SearchIndexClusterValidator also calls clusterStats but not clusterSettings

📄 openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexClusterValidator.java:79-86

In SearchIndexClusterValidator.java, clusterStats is now null-guarded (lines 79-84), but getMaxShardsPerNode(client) is called on line 86. If that method internally calls clusterSettings() or another unsupported AOSS API, it will also fail. Worth verifying that the full code path in this validator is AOSS-safe.

🤖 Prompt for agents

Code Review: Eliminates spurious error logs in AWS OpenSearch Serverless by handling unsupported /_cluster/stats calls. Please also address the missing clusterSettings validation in SearchIndexClusterValidator.

1. 💡 Edge Case: SearchIndexClusterValidator also calls clusterStats but not clusterSettings
   Files: openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexClusterValidator.java:79-86

   In `SearchIndexClusterValidator.java`, `clusterStats` is now null-guarded (lines 79-84), but `getMaxShardsPerNode(client)` is called on line 86. If that method internally calls `clusterSettings()` or another unsupported AOSS API, it will also fail. Worth verifying that the full code path in this validator is AOSS-safe.

Options

Display: compact → Showing less information.

Comment with these commands to change:

`Compact`
`gitar display:verbose`

_{Was this helpful? React with 👍 / 👎 | Gitar}

Copilot

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Reduces false error logs and incorrect UNHEALTHY reporting when OpenMetadata is configured to use AWS OpenSearch Serverless (AOSS) by skipping unsupported cluster APIs and adding null-safe metric handling; also adjusts hard-delete behavior for TestCase children and adds an integration test to validate it.

Changes:

Detect AOSS in OpenSearchClient and propagate an isAoss flag to OpenSearchGenericManager.
Skip unsupported OpenSearch endpoints on AOSS (/_cluster/stats, /_nodes/stats, and /_cluster/health) and safely handle null cluster stats in metric/capacity calculators.
Fix TestCase hard-delete child cleanup behavior and add an IT to verify results/resolution statuses are removed.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchGenericManager.java	Adds `isAoss` handling to skip unsupported APIs and uses `GET /` for AOSS health checks.
openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java	Implements AOSS detection and passes the flag into `OpenSearchGenericManager`.
openmetadata-service/src/main/java/org/openmetadata/service/search/SearchClusterMetrics.java	Adds null-safe defaults when `clusterStats()` can be null (e.g., AOSS).
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java	Fixes hard-delete child deletion loop and removes redundant async deletion.
openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexClusterValidator.java	Adds null-safe defaults for capacity computation when `clusterStats()` is null.
openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TestCaseResourceIT.java	Adds an integration test ensuring hard delete removes results and resolution statuses.

+    boolean isAoss = false;
+    if (config != null && config.getHost() != null && config.getHost().endsWith(".aoss.amazonaws.com")) {
+      isAoss = true;
+    } else if (awsConfig != null && "aoss".equals(awsConfig.getServiceName())) {
+      isAoss = true;
+    }


+    if (isAoss) {
+      LOG.debug("Skipping cluster stats fetch — AWS OpenSearch Serverless does not support /_cluster/stats");
+      return null;
+    }


+      int totalNodes = clusterStats != null && clusterStats.nodes() != null && clusterStats.nodes().count() != null
+          ? clusterStats.nodes().count().total()
+          : 1;
+      int totalShards = clusterStats != null && clusterStats.indices() != null && clusterStats.indices().shards() != null && clusterStats.indices().shards().total() != null
+          ? clusterStats.indices().shards().total().intValue()
+          : 0;


  protected void deleteChildren(
      List<CollectionDAO.EntityRelationshipRecord> children, boolean hardDelete, String updatedBy) {
    if (hardDelete) {
+      TestCaseResolutionStatusRepository testCaseResolutionStatusRepository =
+          (TestCaseResolutionStatusRepository)
+              Entity.getEntityTimeSeriesRepository(Entity.TEST_CASE_RESOLUTION_STATUS);
      for (CollectionDAO.EntityRelationshipRecord entityRelationshipRecord : children) {
        LOG.info(
-            "Recursively {} deleting {} {}",
-            hardDelete ? "hard" : "soft",
+            "Recursively hard deleting {} {}",
            entityRelationshipRecord.getType(),
            entityRelationshipRecord.getId());
-        TestCaseResolutionStatusRepository testCaseResolutionStatusRepository =
-            (TestCaseResolutionStatusRepository)
-                Entity.getEntityTimeSeriesRepository(Entity.TEST_CASE_RESOLUTION_STATUS);
-        for (CollectionDAO.EntityRelationshipRecord child : children) {
-          testCaseResolutionStatusRepository.deleteById(child.getId(), hardDelete);
-        }
+        testCaseResolutionStatusRepository.deleteById(entityRelationshipRecord.getId(), hardDelete);


aniruddhaadak80 added 11 commits April 22, 2026 11:03

Fix O(N^2) delete bug and duplicate async deletion in TestCaseRepository

5473ecb

test: add integration test for hard-deleting test cases and resolving…

3afd4a3

… their children

test: refine TestCase cleanup tests tracking test outcomes and resolv…

2232d25

…e copilot reviews

Fix spotless formatting in TestCaseResourceIT

c58bddc

Fix compilation error: Add missing closing brace in TestCaseResourceIT

b0fed36

fix(tests): Use list and get instead of searchList to bypass @timestamp…

5f05765

… deserialization errors

style: fix checkstyle formatting by unwrapping short listParams

d87bc5a

test: Filter TestCaseResolutionStatus by testCaseId instead of FQN to…

cf710f1

… avoid Awaitility timeouts

Fix testCaseHardDelete_deletes_results_and_resolution_statuses to pas…

52fcc58

…s recursive=true for hard delete

Fix variable name collision in testCaseHardDelete_deletes_results_and…

a6770ab

…_resolution_statuses

Fix AOSS spurious error logs and health check

143d414

Copilot AI review requested due to automatic review settings April 22, 2026 08:03

aniruddhaadak80 mentioned this pull request Apr 22, 2026

OpenSearchGenericManager: Unsupported /_cluster/stats call causes spurious ERROR logs on AWS OpenSearch Serverless (AOSS) #27599

Open

Copilot started reviewing on behalf of aniruddhaadak80 April 22, 2026 08:04 View session

gitar-bot Bot reviewed Apr 22, 2026

View reviewed changes

fix: handle 404 in TestCaseResourceIT cleanup check after hard delete

31fab41

aniruddhaadak80 changed the title ~~Fix: Unsupported /_cluster/stats call causes spurious ERROR logs on AWS OpenSearch Serverless (AOSS)~~ Fix AWS OpenSearch Serverless (AOSS) support and search cluster stability Apr 22, 2026

Copilot AI reviewed Apr 22, 2026

View reviewed changes

aniruddhaadak80 changed the title ~~Fix AWS OpenSearch Serverless (AOSS) support and search cluster stability~~ Fix AWS OpenSearch Serverless AOSS support and search cluster stability Apr 22, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix AWS OpenSearch Serverless AOSS support and search cluster stability#27618

Fix AWS OpenSearch Serverless AOSS support and search cluster stability#27618
aniruddhaadak80 wants to merge 12 commits intoopen-metadata:mainfrom
aniruddhaadak80:fix-aoss-cluster-stats-27599

aniruddhaadak80 commented Apr 22, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Apr 22, 2026

Uh oh!

gitar-bot Bot Apr 22, 2026

Uh oh!

github-actions Bot commented Apr 22, 2026

Uh oh!

gitar-bot Bot commented Apr 22, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

aniruddhaadak80 commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Key Changes

Uh oh!

github-actions Bot commented Apr 22, 2026

Uh oh!

gitar-bot Bot Apr 22, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Apr 22, 2026

Uh oh!

gitar-bot Bot commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

aniruddhaadak80 commented Apr 22, 2026 •

edited

Loading

gitar-bot Bot commented Apr 22, 2026 •

edited

Loading