Skip to content

Add a faster path for single default project retrieving #123662

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

Merged
merged 3 commits into from
Feb 28, 2025
Merged

Add a faster path for single default project retrieving #123662

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e41435f
Add a faster path for single default project retrieving
ywangd Feb 27, 2025
f8214df
Merge remote-tracking branch 'origin/main' into get-project-optimizat…
ywangd Feb 27, 2025
69fd114
Update server/src/main/java/org/elasticsearch/cluster/metadata/Metada…
ywangd Feb 27, 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
30 changes: 21 additions & 9 deletions server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.elasticsearch.common.xcontent.ChunkedToXContent;
import org.elasticsearch.common.xcontent.ChunkedToXContentHelper;
import org.elasticsearch.common.xcontent.XContentParserUtils;
import org.elasticsearch.core.Assertions;
import org.elasticsearch.core.FixForMultiProject;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.core.Tuple;
Expand Down Expand Up @@ -1662,19 +1661,12 @@ public Metadata build() {
}

public Metadata build(boolean skipNameCollisionChecks) {
if (projectMetadata.isEmpty()) {
createDefaultProject();
} else if (Assertions.ENABLED) {
projectMetadata.forEach((id, project) -> {
assert project.getId().equals(id) : "project id mismatch key=[" + id + "] builder=[" + project.getId() + "]";
});
}
return new Metadata(
clusterUUID,
clusterUUIDCommitted,
version,
coordinationMetadata,
Collections.unmodifiableMap(Maps.transformValues(projectMetadata, m -> m.build(skipNameCollisionChecks))),
buildProjectMetadata(skipNameCollisionChecks),
transientSettings,
persistentSettings,
Settings.builder().put(persistentSettings).put(transientSettings).build(),
Expand All @@ -1684,10 +1676,30 @@ public Metadata build(boolean skipNameCollisionChecks) {
);
}

private Map<ProjectId, ProjectMetadata> buildProjectMetadata(boolean skipNameCollisionChecks) {
if (projectMetadata.isEmpty()) {
createDefaultProject();
}
assert assertProjectIdAndProjectMetadataConsistency();
if (projectMetadata.size() == 1) {
final var entry = projectMetadata.entrySet().iterator().next();
return Map.of(entry.getKey(), entry.getValue().build(skipNameCollisionChecks));
} else {
return Collections.unmodifiableMap(Maps.transformValues(projectMetadata, m -> m.build(skipNameCollisionChecks)));
}
}

private ProjectMetadata.Builder createDefaultProject() {
return projectMetadata.put(DEFAULT_PROJECT_ID, new ProjectMetadata.Builder(Map.of(), 0).id(DEFAULT_PROJECT_ID));
}

private boolean assertProjectIdAndProjectMetadataConsistency() {
projectMetadata.forEach((id, project) -> {
assert project.getId().equals(id) : "project id mismatch key=[" + id + "] builder=[" + project.getId() + "]";
});
return true;
}

/**
* There are a set of specific custom sections that have moved from top-level sections to project-level sections
* as part of the multi-project refactor. Enumerate them here so we can move them to the right place
Expand Down