Skip to content

Commit 3b4576d

Browse files
committed
change TransportSingleShardAction
1 parent 8cf05a6 commit 3b4576d

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.elasticsearch.common.io.stream.Writeable;
3232
import org.elasticsearch.common.logging.LoggerMessageFormat;
3333
import org.elasticsearch.common.util.concurrent.EsExecutors;
34-
import org.elasticsearch.core.FixForMultiProject;
3534
import org.elasticsearch.core.Nullable;
3635
import org.elasticsearch.index.shard.ShardId;
3736
import org.elasticsearch.tasks.Task;
@@ -122,11 +121,8 @@ protected void asyncShardOperation(Request request, ShardId shardId, ActionListe
122121

123122
protected abstract boolean resolveIndex(Request request);
124123

125-
@FixForMultiProject(
126-
description = "Many actions extend TransportSingleShardAction, consider checking for project global blocks when applicable"
127-
)
128124
protected static ClusterBlockException checkGlobalBlock(ProjectState state) {
129-
return state.blocks().globalBlockedException(ClusterBlockLevel.READ);
125+
return state.blocks().globalBlockedException(state.projectId(), ClusterBlockLevel.READ);
130126
}
131127

132128
protected ClusterBlockException checkRequestBlock(ProjectState state, InternalRequest request) {

0 commit comments

Comments
 (0)