Skip to content

Use MultiProjectPendingException more consistently #123955

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
Mar 5, 2025
Merged

Use MultiProjectPendingException more consistently #123955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddd4650
Use MultiProjectPendingException more consistently
ywangd Mar 4, 2025
1a94d1e
comment
ywangd Mar 4, 2025
a9c77c8
Merge branch 'main' into use-multi-project-pending-exception-more-con…
elasticmachine Mar 4, 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
4 changes: 2 additions & 2 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 @@ -397,7 +397,7 @@ private Metadata updateSingleProject(Function<ProjectMetadata, ProjectMetadata>
reservedStateMetadata
);
} else {
throw new UnsupportedOperationException("There are multiple projects " + projectMetadata.keySet());
throw new MultiProjectPendingException("There are multiple projects " + projectMetadata.keySet());
}
}

Expand Down Expand Up @@ -1310,7 +1310,7 @@ private ProjectMetadata.Builder getSingleProject() {
if (projectMetadata.isEmpty()) {
createDefaultProject();
} else if (projectMetadata.size() != 1) {
throw new UnsupportedOperationException("There are multiple projects " + projectMetadata.keySet());
throw new MultiProjectPendingException("There are multiple projects " + projectMetadata.keySet());
}
return projectMetadata.values().iterator().next();
}
Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/cluster/routing/GlobalRoutingTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.elasticsearch.cluster.DiffableUtils;
import org.elasticsearch.cluster.DiffableUtils.KeySerializer;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.metadata.Metadata.MultiProjectPendingException;
import org.elasticsearch.cluster.metadata.ProjectId;
import org.elasticsearch.cluster.metadata.ProjectMetadata;
import org.elasticsearch.common.collect.ImmutableOpenMap;
Expand Down Expand Up @@ -134,7 +135,7 @@ public RoutingTable getRoutingTable() {
return switch (routingTables.size()) {
case 0 -> RoutingTable.EMPTY_ROUTING_TABLE;
case 1 -> routingTables.values().iterator().next();
default -> throw new IllegalStateException("There are multiple project routing tables [" + routingTables.keySet() + "]");
default -> throw new MultiProjectPendingException("There are multiple project routing tables [" + routingTables.keySet() + "]");
};
}

Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ private static void callClusterStateListener(
listener.clusterChanged(clusterChangedEvent);
}
} catch (Metadata.MultiProjectPendingException e) {
// don't warn, this fills the logs
// don't warn, this fills the logs and also slow down applier thread in CI which could cause unrelated failures
logger.trace("ClusterStateListener not multi-project compatible", e);
} catch (Exception ex) {
logger.warn("failed to notify ClusterStateListener", ex);
Expand Down