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.

Sign up for GitHub

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

Jump to bottom

[#192624] multiple_es_nodes #193899

Merged
merged 4 commits into from
Sep 25, 2024
Merged

[#192624] multiple_es_nodes #193899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c09fe2
[#192624] `multiple_es_nodes`
afharo Sep 24, 2024
a225053
Remove comment
afharo Sep 25, 2024
6a699b5
Recompress with ditto
afharo Sep 25, 2024
97b4937
Revert "Recompress with ditto"
afharo Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/kbn-test/src/es/test_es_cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,10 @@ export function createTestEsCluster<
`transport.port=${transportPort ?? esTestConfig.getTransportPort()}`,
// For multi-node clusters, we make all nodes master-eligible by default.
...(nodes.length > 1
? ['discovery.type=zen', `cluster.initial_master_nodes=${nodes.map((n) => n.name).join(',')}`]
? [
'discovery.type=multi-node',
Copy link
Member Author

Choose a reason for hiding this comment

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

zen is no longer supported

`cluster.initial_master_nodes=${nodes.map((n) => n.name).join(',')}`,
]
: ['discovery.type=single-node']),
];

Expand Down
Binary file modified src/core/server/integration_tests/saved_objects/migrations/archives/7.13.0_5k_so_node_01.zip
View file
Open in desktop
Binary file not shown.
Binary file modified src/core/server/integration_tests/saved_objects/migrations/archives/7.13.0_5k_so_node_02.zip
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ function createRoot({ logFileName, hosts }: RootConfig) {
});
}

// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2', () => {
describe('migration v2', () => {
let esServer: TestElasticsearchUtils;
let root: Root;
const migratedIndexAlias = `.kibana_${pkg.version}`;
Expand Down