Skip to content

Commit fde5fe0

Browse files
committed
Add special origin to call refresh shard
1 parent 849e31c commit fde5fe0

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

server/src/main/java/org/elasticsearch/action/termvectors/EnsureDocsSearchableAction.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public class EnsureDocsSearchableAction {
3030

3131
private static final String ACTION_NAME = "internal:index/data/read/eds";
3232
public static final ActionType<ActionResponse.Empty> TYPE = new ActionType<>(ACTION_NAME);
33+
public static final String ENSURE_DOCS_SEARCHABLE_ORIGIN = "ensure_docs_searchable";
3334

3435
public static final class EnsureDocsSearchableRequest extends SingleShardRequest<EnsureDocsSearchableRequest> {
3536

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/SystemPrivilege.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public final class SystemPrivilege extends Privilege {
4545
CompletionPersistentTaskAction.INSTANCE.name(), // needed for ShardFollowTaskCleaner
4646
"indices:data/write/*", // needed for SystemIndexMigrator
4747
"indices:data/read/*", // needed for SystemIndexMigrator
48-
"indices:admin/refresh*", // needed for SystemIndexMigrator and EnsureDocsSearchableAction
48+
"indices:admin/refresh", // needed for SystemIndexMigrator
4949
"indices:admin/aliases", // needed for SystemIndexMigrator
5050
TransportCreateIndexAction.TYPE.name() + "*", // needed for SystemIndexMigrator
5151
TransportAddIndexBlockAction.TYPE.name() + "*", // needed for SystemIndexMigrator

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import static org.elasticsearch.action.admin.cluster.node.tasks.get.TransportGetTaskAction.TASKS_ORIGIN;
2323
import static org.elasticsearch.action.bulk.TransportBulkAction.LAZY_ROLLOVER_ORIGIN;
2424
import static org.elasticsearch.action.support.replication.PostWriteRefresh.POST_WRITE_REFRESH_ORIGIN;
25+
import static org.elasticsearch.action.termvectors.EnsureDocsSearchableAction.ENSURE_DOCS_SEARCHABLE_ORIGIN;
2526
import static org.elasticsearch.cluster.metadata.DataStreamLifecycle.DATA_STREAM_LIFECYCLE_ORIGIN;
2627
import static org.elasticsearch.ingest.IngestService.INGEST_ORIGIN;
2728
import static org.elasticsearch.persistent.PersistentTasksService.PERSISTENT_TASK_ORIGIN;
@@ -132,6 +133,7 @@ public static void switchUserBasedOnActionOriginAndExecute(
132133
case SECURITY_PROFILE_ORIGIN:
133134
securityContext.executeAsInternalUser(InternalUsers.SECURITY_PROFILE_USER, version, consumer);
134135
break;
136+
case ENSURE_DOCS_SEARCHABLE_ORIGIN:
135137
case POST_WRITE_REFRESH_ORIGIN:
136138
securityContext.executeAsInternalUser(InternalUsers.STORAGE_USER, version, consumer);
137139
break;

0 commit comments

Comments
 (0)