Skip to content
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

[7.17] Handling exceptions on watcher reload (#105442) #106209

Merged
merged 2 commits into from
Mar 13, 2024

Conversation

sakurai-youhei
Copy link
Member

Backports the following commits to 7.17:

@sakurai-youhei sakurai-youhei added :Data Management/Watcher >bug backport external-contributor Pull request authored by a developer outside the Elasticsearch team Team:Data Management Meta label for data/management team labels Mar 11, 2024
@sakurai-youhei
Copy link
Member Author

The build failed with the following errors:

> Task :x-pack:plugin:watcher:compileTestJava
/.../elasticsearch-pull-request/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java:314: error: cannot find symbol
            .settings(settings(IndexVersion.current()).put(IndexMetadata.INDEX_FORMAT_SETTING.getKey(), 6)) // the internal index format,
                               ^
  symbol:   variable IndexVersion
  location: class WatcherLifeCycleServiceTests
/.../elasticsearch-pull-request/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java:325: error: cannot find symbol
            .nodes(nodes.withMasterNodeId("node_1"))
                        ^
  symbol:   method withMasterNodeId(String)
  location: variable nodes of type DiscoveryNodes
/.../elasticsearch-pull-request/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java:330: error: cannot find symbol
            .nodes(nodes.withMasterNodeId("node_2"))
                        ^
  symbol:   method withMasterNodeId(String)
  location: variable nodes of type DiscoveryNodes
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
3 errors

The first error indicates that the test depends on #94827, which is not back-ported to the 7.17 branch. But IndexVersion.current() could be rewritten with Version.CURRENT.

The second and third errors indicate that the test depends on #96836, which is also not back-ported to the 7.17. branch. But nodes.withMasterNodeId("X") could be rewritten with DiscoveryNodes.builder(nodes).masterNodeId("X").

@sakurai-youhei sakurai-youhei requested a review from masseyke March 12, 2024 11:51
Copy link
Member

@masseyke masseyke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for updating it for V7 compatibility!

@masseyke masseyke merged commit 057843e into elastic:7.17 Mar 13, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport >bug :Data Management/Watcher external-contributor Pull request authored by a developer outside the Elasticsearch team Team:Data Management Meta label for data/management team v7.17.19
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants