Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
21d7b30
Don't fail on first node-join publication failure
joshua-adams-1 Jul 28, 2025
829c69f
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Jul 28, 2025
fb05a2a
Checkstyle
joshua-adams-1 Jul 28, 2025
962b3b2
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Jul 28, 2025
4b97f07
Adds Node Joining Integration Tests
joshua-adams-1 Aug 7, 2025
2a541b0
Adds nodeExistsWithName method
joshua-adams-1 Aug 7, 2025
eb572d4
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Aug 7, 2025
3e501b4
Minor tweaks
joshua-adams-1 Aug 7, 2025
b6ddfba
Uncomments out solution, and makes NodeJoiningIT
joshua-adams-1 Aug 11, 2025
dac102a
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Aug 11, 2025
d269e47
Ran ./gradlew spotlessApply precommit
joshua-adams-1 Aug 11, 2025
a668ab1
Modify Coordinator Logic
joshua-adams-1 Aug 12, 2025
17e6bd6
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Aug 14, 2025
cc67155
Generalise logging expectations
joshua-adams-1 Aug 14, 2025
d47915b
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Aug 14, 2025
f7cbcbd
[CI] Auto commit changes from spotless
Aug 14, 2025
c989fd0
Add YAML test for "missing lookup key" scenario (#132870)
smalyshev Aug 14, 2025
c1b1ef2
Add memory accounting to exponential histogram library. (#132580)
JonasKunz Aug 14, 2025
6708bb4
Vectorize BQVectorUtils#packAsBinary (#132923)
iverase Aug 14, 2025
4150643
Mute org.elasticsearch.xpack.esql.qa.mixed.EsqlClientYamlIT test {p0=…
elasticsearchmachine Aug 14, 2025
170a518
Remove mutes for resolved CsvTests issues (#132924)
idegtiarenko Aug 14, 2025
2ee0871
ESQL - Allow null values in vector similarity functions (#132919)
carlosdelest Aug 14, 2025
5eec40f
Vectorize BQSpaceUtils#transposeHalfByte (#132935)
iverase Aug 14, 2025
c27fe6a
Send max of two types of max queue latency to ClusterInfo (#132675)
DiannaHohensee Aug 14, 2025
15d6693
[DiskBBQ] Replace n_probe, related to the number of centroids with v…
iverase Aug 14, 2025
6c3fadc
[ML] Add spec files for Llama and AI21 (#132724)
jonathan-buttner Aug 14, 2025
f45e1ad
Remove awaits for closed issues (#132306)
smalyshev Aug 14, 2025
b238367
Suppport per-project behavior in ESQL extra verifiers (#131884)
mark-vieira Aug 14, 2025
36c9f02
Add random tests with match_only_text multi-field (#132380)
parkertimmins Aug 14, 2025
ba8c5e6
Store ignored source in unique stored fields per entry (#132142)
jordan-powers Aug 14, 2025
4a8f3f7
Rename skipping logic to remove hard link to skip_unavailable (#132861)
smalyshev Aug 14, 2025
cdfdb5e
Mute org.elasticsearch.index.mapper.LongFieldMapperTests testFetchMan…
elasticsearchmachine Aug 14, 2025
a4ac7fb
Adding simulate ingest effective mapping (#132833)
masseyke Aug 14, 2025
cbbacc0
Precompute the BitsetCacheKey hashCode (#132875)
joegallo Aug 14, 2025
c0a079f
Fix failing UT by adding a required capability (#132947)
julian-elastic Aug 14, 2025
3337cf2
Mute org.elasticsearch.index.mapper.LongFieldMapperTests testFetch #1…
elasticsearchmachine Aug 14, 2025
57e5887
Remove CrossClusterCancellationIT.createLocalIndex() (#132952)
JeremyDahlgren Aug 14, 2025
25333ca
Unmuting simulate index data stream mapping overrides yaml rest test …
masseyke Aug 14, 2025
433b827
Mute org.elasticsearch.cluster.ClusterInfoServiceIT testMaxQueueLaten…
elasticsearchmachine Aug 14, 2025
9203679
Introduce execution location marker for better handling of remote/loc…
smalyshev Aug 14, 2025
e6b86ef
Implement v_magnitude function (#132765)
svilen-mihaylov-elastic Aug 14, 2025
a180eaf
Breakdown undesired allocations by shard routing role (#132235)
nicktindall Aug 14, 2025
57db61c
Switch to PR-based benchmark pipeline defined in ES repo (#132941)
gbanasiak Aug 15, 2025
af0c58e
Mute org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT test {…
elasticsearchmachine Aug 15, 2025
b7922ff
Implement WriteLoadConstraintDecider#canAllocate (#132041)
DiannaHohensee Aug 15, 2025
6485e97
Simplify EsqlSession (#132848)
idegtiarenko Aug 15, 2025
1d35bd3
Mute org.elasticsearch.index.mapper.LongFieldMapperTests testSyntheti…
elasticsearchmachine Aug 15, 2025
332a86c
Speed up loading keyword fields with index sorts (#132950)
dnhatn Aug 15, 2025
98be4ad
Merge remote-tracking branch 'upstream/main' into master-node-disconnect
joshua-adams-1 Aug 15, 2025
0e227f7
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Aug 15, 2025
00b27f3
Remove logger.info
joshua-adams-1 Aug 15, 2025
8c4de89
David Turner Comments
joshua-adams-1 Aug 19, 2025
d5141bc
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Aug 19, 2025
ed73225
Fix unit tests
joshua-adams-1 Aug 20, 2025
a7b2f0e
Merge branch 'master-node-disconnect' of github.com:joshua-adams-1/el…
joshua-adams-1 Aug 20, 2025
ad45d19
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Aug 20, 2025
0b4560f
Comments
joshua-adams-1 Aug 22, 2025
aa82afe
Unused method
joshua-adams-1 Aug 22, 2025
8323493
Merge branch 'master-node-disconnect' of github.com:joshua-adams-1/el…
joshua-adams-1 Aug 22, 2025
ff5b4ec
[CI] Auto commit changes from spotless
Aug 22, 2025
8ad70a2
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Aug 22, 2025
8316b56
Changes
joshua-adams-1 Aug 22, 2025
8bf17e5
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Aug 26, 2025
3f46e13
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Aug 27, 2025
75b118a
David Comments
joshua-adams-1 Sep 1, 2025
c9f608f
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Sep 1, 2025
2f493f5
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Sep 2, 2025
dc7eb96
Merge branch 'master-node-disconnect' of github.com:joshua-adams-1/el…
joshua-adams-1 Sep 2, 2025
3683676
David Comments
joshua-adams-1 Sep 2, 2025
cd8502a
Merge branch 'main' into master-node-disconnect
joshua-adams-1 Sep 2, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ Therefore, this WARN log should not be thrown (#ES-11449)
String newNodeName = internalCluster().startDataOnlyNode();

// Assert the master was re-elected
assertTrue(masterNodeName.equals(internalCluster().getMasterName()) && originalTerm < getTerm(masterNodeName));
assertEquals(masterNodeName, internalCluster().getMasterName());
assertTrue(originalTerm < getTerm(masterNodeName));

// Assert all nodes have accepted N into their cluster state
assertNewNodeIsInAllClusterStates(newNodeName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -692,26 +692,27 @@ public void clusterChanged(ClusterChangedEvent event) {
final var discoveryNodes = event.state().nodes();
// Keep the connection open until the next committed state
if (discoveryNodes.getMasterNode() != null) {
// Remove this listener to avoid memory leaks
clusterService.removeListener(this);

if (discoveryNodes.nodeExists(joinRequest.getSourceNode().getId())) {
// Remove this listener to avoid memory leaks
clusterService.removeListener(this);
Copy link
Contributor

Choose a reason for hiding this comment

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

Why have this within the if branches? It's on both branches so we call it either way, and I don't see a need to call it after calling nodeExists or anything like that?

ll.onResponse(null);
} else {
clusterService.removeListener(this);
ll.onFailure(e);
}
}
}
};
clusterService.addListener(clusterStateListener);

// Another node was elected, and doesn't have the node in it
if (clusterService.state().nodes().getMasterNode() != null
&& clusterService.state().nodes().nodeExists(joinRequest.getSourceNode().getId()) == false) {
// Remove this listener to avoid memory leaks
clusterService.removeListener(clusterStateListener);
ll.onFailure(e);
}
clusterStateListener.clusterChanged(
new ClusterChangedEvent(
"Checking if another master has been elected since "
+ joinRequest.getSourceNode().getName()
+ " attempted to join cluster",
clusterService.state(),
clusterService.state()
)
);
} else {
ll.onFailure(e);
}
Expand Down
Loading