-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Migrate datanode upgrade service adapter #24967
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
Migrates the datanode upgrade service adapter to use the OpenSearch 3 client and aligns shard replication/flush operations with the new adapter contract and typed health status.
Changes:
- Updates
DatanodeUpgradeServiceAdapterto returnFlushResponsefrom shard replication operations and removes the standaloneflush()method. - Switches cluster health from
Stringto typedHealthStatusacross DTOs/services and updates comparisons accordingly. - Introduces new adapter implementation/tests for OpenSearch 3 and adds/adjusts integration tests for OpenSearch 2/3.
Reviewed changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| graylog2-server/src/test/java/org/graylog2/datanode/DatanodeUpgradeServiceTest.java | Adjusts tests to use typed HealthStatus and new adapter method signatures. |
| graylog2-server/src/test/java/org/graylog/plugins/datanode/DatanodeUpgradeServiceAdapterIT.java | Adds shared integration test coverage for adapter upgrade operations. |
| graylog2-server/src/main/java/org/graylog2/indexer/indices/HealthStatus.java | Adds uppercase toString() to align string representation with external expectations. |
| graylog2-server/src/main/java/org/graylog2/datanode/DatanodeUpgradeService.java | Updates health checks and replication start/stop to match adapter contract changes. |
| graylog2-server/src/main/java/org/graylog/plugins/datanode/dto/ClusterState.java | Changes status type from String to HealthStatus. |
| graylog2-server/src/main/java/org/graylog/plugins/datanode/DatanodeUpgradeServiceAdapter.java | Changes adapter API: shard replication methods return FlushResponse, removes flush(). |
| graylog-storage-opensearch3/src/test/java/org/graylog/storage/opensearch3/DatanodeUpgradeServiceAdapterOSIT.java | Adds OS3-specific integration test wiring for the new adapter. |
| graylog-storage-opensearch3/src/main/java/org/graylog/storage/opensearch3/OpenSearch3Module.java | Binds the supported adapter to the new OS3 implementation. |
| graylog-storage-opensearch3/src/main/java/org/graylog/storage/opensearch3/DatanodeUpgradeServiceAdapterOS2.java | Removes the OS2-based adapter from the OS3 module. |
| graylog-storage-opensearch3/src/main/java/org/graylog/storage/opensearch3/DatanodeUpgradeServiceAdapterOS.java | Adds new OS3 adapter using the official OpenSearch Java client. |
| graylog-storage-opensearch2/src/test/java/org/graylog/storage/opensearch2/DatanodeUpgradeServiceAdapterOS2IT.java | Adds OS2 integration test wiring based on the shared adapter IT. |
| graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/DatanodeUpgradeServiceAdapterOS2.java | Updates OS2 adapter to typed HealthStatus and new replication/flush contract. |
| graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/DatanodeUpgradeServiceAdapterES7.java | Updates ES7 adapter to the new FlushResponse-returning method signatures. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
...ensearch3/src/main/java/org/graylog/storage/opensearch3/DatanodeUpgradeServiceAdapterOS.java
Show resolved
Hide resolved
...ensearch3/src/main/java/org/graylog/storage/opensearch3/DatanodeUpgradeServiceAdapterOS.java
Outdated
Show resolved
Hide resolved
...nsearch2/src/main/java/org/graylog/storage/opensearch2/DatanodeUpgradeServiceAdapterOS2.java
Show resolved
Hide resolved
...ensearch3/src/main/java/org/graylog/storage/opensearch3/DatanodeUpgradeServiceAdapterOS.java
Outdated
Show resolved
Hide resolved
graylog2-server/src/main/java/org/graylog2/datanode/DatanodeUpgradeService.java
Outdated
Show resolved
Hide resolved
…opensearch3/DatanodeUpgradeServiceAdapterOS.java Co-authored-by: Copilot <[email protected]>
…opensearch3/DatanodeUpgradeServiceAdapterOS.java Co-authored-by: Copilot <[email protected]>
…gradeService.java Co-authored-by: Copilot <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
Copilot reviewed 13 out of 13 changed files in this pull request and generated 6 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
/nocl internal migration to os3 client
Description
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: