Skip to content

Commit 77e4f53

Browse files
author
sukriti sinha
committed
Address review comments
Signed-off-by: sukriti sinha <[email protected]>
1 parent 2774300 commit 77e4f53

File tree

8 files changed

+166
-444
lines changed

8 files changed

+166
-444
lines changed

gradle/run.gradle

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111

1212
/*
1313
* Licensed to Elasticsearch under one or more contributor
14-
* license agreements. See the
15-
NOTICE file distributed with
14+
* license agreements. See the NOTICE file distributed with
1615
* this work for additional information regarding copyright
1716
* ownership. Elasticsearch licenses this file to you under
1817
* the Apache License, Version 2.0 (the "License"); you may
@@ -40,17 +39,6 @@ testClusters {
4039
testDistribution = 'archive'
4140
if (numZones > 1) numberOfZones = numZones
4241
if (numNodes > 1) numberOfNodes = numNodes
43-
setting 'node.attr.remote_store.segment.repository', 'my-repository'
44-
setting 'node.attr.remote_store.translog.repository', 'my-repository'
45-
setting 'node.attr.remote_store.state.repository', 'my-repository'
46-
setting 'node.attr.remote_store.repository.my-repository.type', 'fs'
47-
setting 'path.repo', '/Users/sukriiti/remote-store-data'
48-
setting 'node.attr.remote_store.repository.my-repository.settings.location', '/Users/sukriiti/remote-store-data'
49-
// setting 'opensearch.experimental.feature.tiered_remote_index.enabled', 'true'
50-
// setting 'opensearch.experimental.feature.pluggable.caching.enabled', 'true'
51-
setting 'node.search.cache.size', '10gb'
52-
setting 'node.roles', 'ingest,remote_cluster_client,data,cluster_manager'
53-
5442
if (findProperty("installedPlugins")) {
5543
installedPlugins = Eval.me(installedPlugins)
5644
for (String p : installedPlugins) {

server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreMetadataIT.java

Lines changed: 47 additions & 249 deletions
Large diffs are not rendered by default.

server/src/main/java/org/opensearch/action/admin/cluster/remotestore/metadata/RemoteStoreMetadata.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
package org.opensearch.action.admin.cluster.remotestore.metadata;
1010

11-
import org.opensearch.common.annotation.PublicApi;
11+
import org.opensearch.common.annotation.ExperimentalApi;
1212
import org.opensearch.core.common.io.stream.StreamInput;
1313
import org.opensearch.core.common.io.stream.StreamOutput;
1414
import org.opensearch.core.common.io.stream.Writeable;
15-
import org.opensearch.core.xcontent.ToXContent.Params;
1615
import org.opensearch.core.xcontent.ToXContentFragment;
1716
import org.opensearch.core.xcontent.XContentBuilder;
1817

@@ -24,7 +23,7 @@
2423
*
2524
* @opensearch.internal
2625
*/
27-
@PublicApi(since = "3.0.0")
26+
@ExperimentalApi
2827
public class RemoteStoreMetadata implements Writeable, ToXContentFragment {
2928
private final Map<String, Object> segments;
3029
private final Map<String, Object> translog;
@@ -87,4 +86,12 @@ public String getIndexName() {
8786
public int getShardId() {
8887
return shardId;
8988
}
89+
90+
public Map<String, Object> getSegments() {
91+
return segments;
92+
}
93+
94+
public Map<String, Object> getTranslog() {
95+
return translog;
96+
}
9097
}

server/src/main/java/org/opensearch/action/admin/cluster/remotestore/metadata/RemoteStoreMetadataRequest.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,20 @@
99
package org.opensearch.action.admin.cluster.remotestore.metadata;
1010

1111
import org.opensearch.action.support.broadcast.BroadcastRequest;
12-
import org.opensearch.common.annotation.PublicApi;
12+
import org.opensearch.common.annotation.ExperimentalApi;
1313
import org.opensearch.core.common.io.stream.StreamInput;
1414
import org.opensearch.core.common.io.stream.StreamOutput;
1515

1616
import java.io.IOException;
1717

1818
/**
19-
* Request object for fetching remote store metadata of shards for a given index.
19+
* Request object for fetching remote store metadata of shards across one or more indices.
2020
*
2121
* @opensearch.internal
2222
*/
23-
@PublicApi(since = "3.0.0")
23+
@ExperimentalApi
2424
public class RemoteStoreMetadataRequest extends BroadcastRequest<RemoteStoreMetadataRequest> {
2525
private String[] shards;
26-
private boolean local = false;
2726

2827
public RemoteStoreMetadataRequest() {
2928
super((String[]) null);
@@ -33,14 +32,12 @@ public RemoteStoreMetadataRequest() {
3332
public RemoteStoreMetadataRequest(StreamInput in) throws IOException {
3433
super(in);
3534
shards = in.readStringArray();
36-
local = in.readBoolean();
3735
}
3836

3937
@Override
4038
public void writeTo(StreamOutput out) throws IOException {
4139
super.writeTo(out);
4240
out.writeStringArray(shards);
43-
out.writeBoolean(local);
4441
}
4542

4643
public RemoteStoreMetadataRequest shards(String... shards) {
@@ -51,12 +48,4 @@ public RemoteStoreMetadataRequest shards(String... shards) {
5148
public String[] shards() {
5249
return this.shards;
5350
}
54-
55-
public void local(boolean local) {
56-
this.local = local;
57-
}
58-
59-
public boolean local() {
60-
return local;
61-
}
6251
}

server/src/main/java/org/opensearch/action/admin/cluster/remotestore/metadata/RemoteStoreMetadataRequestBuilder.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
package org.opensearch.action.admin.cluster.remotestore.metadata;
1010

1111
import org.opensearch.action.support.broadcast.BroadcastOperationRequestBuilder;
12-
import org.opensearch.common.annotation.PublicApi;
12+
import org.opensearch.common.annotation.ExperimentalApi;
1313
import org.opensearch.common.unit.TimeValue;
1414
import org.opensearch.transport.client.OpenSearchClient;
1515

@@ -18,7 +18,7 @@
1818
*
1919
* @opensearch.api
2020
*/
21-
@PublicApi(since = "3.0.0")
21+
@ExperimentalApi
2222
public class RemoteStoreMetadataRequestBuilder extends BroadcastOperationRequestBuilder<
2323
RemoteStoreMetadataRequest,
2424
RemoteStoreMetadataResponse,
@@ -43,12 +43,4 @@ public final RemoteStoreMetadataRequestBuilder setShards(String... shards) {
4343
request.shards(shards);
4444
return this;
4545
}
46-
47-
/**
48-
* Sets local shards preference of request.
49-
*/
50-
public final RemoteStoreMetadataRequestBuilder setLocal(boolean local) {
51-
request.local(local);
52-
return this;
53-
}
5446
}

server/src/main/java/org/opensearch/action/admin/cluster/remotestore/metadata/RemoteStoreMetadataResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
package org.opensearch.action.admin.cluster.remotestore.metadata;
1010

1111
import org.opensearch.action.support.broadcast.BroadcastResponse;
12-
import org.opensearch.common.annotation.PublicApi;
12+
import org.opensearch.common.annotation.ExperimentalApi;
1313
import org.opensearch.core.action.support.DefaultShardOperationFailedException;
1414
import org.opensearch.core.common.Strings;
1515
import org.opensearch.core.common.io.stream.StreamInput;
@@ -28,7 +28,7 @@
2828
*
2929
* @opensearch.api
3030
*/
31-
@PublicApi(since = "3.0.0")
31+
@ExperimentalApi
3232
public class RemoteStoreMetadataResponse extends BroadcastResponse {
3333
private final RemoteStoreMetadata[] remoteStoreMetadata;
3434

0 commit comments

Comments
 (0)