Skip to content
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

Shard Indexing Pressure changes to be merged #1336

Merged
merged 11 commits into from
Oct 7, 2021
Merged

Shard Indexing Pressure changes to be merged #1336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
12bd3a5
Add Shard Indexing Pressure Settings. (#478) (#716)
getsaurabh02 May 19, 2021
d96bc7a
Refactor IndexingPressure to allow extension. (#478) (#718)
getsaurabh02 May 20, 2021
9c88399
Add Shard Indexing Pressure Tracker. (#478) (#717)
getsaurabh02 Jun 9, 2021
3c8c156
Add Shard Indexing Pressure Store (#478) (#838)
getsaurabh02 Jul 7, 2021
d4a48be
Add Shard Indexing Pressure Memory Manager (#478) (#945)
getsaurabh02 Jul 20, 2021
b222f3f
Add ShardIndexingPressure framework level construct and Stats (#1015)
getsaurabh02 Aug 12, 2021
b70dbca
Add Indexing Pressure Service which acts as orchestrator for indexing…
getsaurabh02 Aug 19, 2021
3105cc5
Add plumbing logic for IndexingPressureService in Transport Actions. …
getsaurabh02 Aug 30, 2021
522fdb0
Add shard indexing pressure metric/stats via rest end point. (#1171)
getsaurabh02 Sep 3, 2021
e9cfb0b
Add shard indexing pressure integration tests. (#1198)
getsaurabh02 Sep 9, 2021
67b0be6
Fix failing tests.
adnapibar Sep 25, 2021
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
297 changes: 297 additions & 0 deletions qa/smoke-test-http/src/test/java/org/opensearch/http/ShardIndexingPressureRestIT.java
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion ...rTest/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,7 +1283,15 @@ private void verifyShardInfo(XContentParser parser, boolean primary, boolean inc
assertTrue(parser.currentName().equals("id")
|| parser.currentName().equals("name")
|| parser.currentName().equals("transport_address")
|| parser.currentName().equals("weight_ranking"));
|| parser.currentName().equals("weight_ranking")
|| parser.currentName().equals("attributes"));
// Skip past attributes object
if (parser.currentName().equals("attributes")) {
while(!parser.nextToken().equals(Token.END_OBJECT)) {
parser.nextToken();
}
break;
}
} else {
assertTrue(token.isValue());
assertNotNull(parser.text());
Expand Down Expand Up @@ -1403,6 +1411,11 @@ private String verifyNodeDecisionPrologue(XContentParser parser) throws IOExcept
parser.nextToken();
assertNotNull(parser.text());
parser.nextToken();
assertEquals("node_attributes", parser.currentName());
// skip past node_attributes object
while (!parser.currentName().equals("node_decision")) {
parser.nextToken();
}
assertEquals("node_decision", parser.currentName());
parser.nextToken();
return nodeName;
Expand Down
31 changes: 22 additions & 9 deletions server/src/internalClusterTest/java/org/opensearch/index/IndexingPressureIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,15 @@ public class IndexingPressureIT extends OpenSearchIntegTestCase {

private static final Settings unboundedWriteQueue = Settings.builder().put("thread_pool.write.queue_size", -1).build();

public static final Settings settings = Settings.builder()
.put(ShardIndexingPressureSettings.SHARD_INDEXING_PRESSURE_ENABLED.getKey(), false).build();

@Override
protected Settings nodeSettings(int nodeOrdinal) {
return Settings.builder()
.put(super.nodeSettings(nodeOrdinal))
.put(unboundedWriteQueue)
.put(settings)
.build();
}

Expand Down Expand Up @@ -148,9 +152,12 @@ public void testWriteBytesAreIncremented() throws Exception {
final ActionFuture<BulkResponse> successFuture = client(coordinatingOnlyNode).bulk(bulkRequest);
replicationSendPointReached.await();

IndexingPressure primaryWriteLimits = internalCluster().getInstance(IndexingPressure.class, primaryName);
IndexingPressure replicaWriteLimits = internalCluster().getInstance(IndexingPressure.class, replicaName);
IndexingPressure coordinatingWriteLimits = internalCluster().getInstance(IndexingPressure.class, coordinatingOnlyNode);
IndexingPressure primaryWriteLimits = internalCluster()
.getInstance(IndexingPressureService.class, primaryName).getShardIndexingPressure();
IndexingPressure replicaWriteLimits = internalCluster()
.getInstance(IndexingPressureService.class, replicaName).getShardIndexingPressure();;
IndexingPressure coordinatingWriteLimits = internalCluster()
.getInstance(IndexingPressureService.class, coordinatingOnlyNode).getShardIndexingPressure();;

assertThat(primaryWriteLimits.getCurrentCombinedCoordinatingAndPrimaryBytes(), greaterThan(bulkShardRequestSize));
assertThat(primaryWriteLimits.getCurrentPrimaryBytes(), greaterThan(bulkShardRequestSize));
Expand Down Expand Up @@ -271,9 +278,12 @@ public void testWriteCanBeRejectedAtCoordinatingLevel() throws Exception {
try (Releasable replicaRelease = blockReplicas(replicaThreadPool)) {
final ActionFuture<BulkResponse> successFuture = client(coordinatingOnlyNode).bulk(bulkRequest);

IndexingPressure primaryWriteLimits = internalCluster().getInstance(IndexingPressure.class, primaryName);
IndexingPressure replicaWriteLimits = internalCluster().getInstance(IndexingPressure.class, replicaName);
IndexingPressure coordinatingWriteLimits = internalCluster().getInstance(IndexingPressure.class, coordinatingOnlyNode);
IndexingPressure primaryWriteLimits = internalCluster()
.getInstance(IndexingPressureService.class, primaryName).getShardIndexingPressure();
IndexingPressure replicaWriteLimits = internalCluster()
.getInstance(IndexingPressureService.class, replicaName).getShardIndexingPressure();
IndexingPressure coordinatingWriteLimits = internalCluster()
.getInstance(IndexingPressureService.class, coordinatingOnlyNode).getShardIndexingPressure();

assertBusy(() -> {
assertThat(primaryWriteLimits.getCurrentCombinedCoordinatingAndPrimaryBytes(), greaterThan(bulkShardRequestSize));
Expand Down Expand Up @@ -335,9 +345,12 @@ public void testWriteCanBeRejectedAtPrimaryLevel() throws Exception {
try (Releasable replicaRelease = blockReplicas(replicaThreadPool)) {
final ActionFuture<BulkResponse> successFuture = client(primaryName).bulk(bulkRequest);

IndexingPressure primaryWriteLimits = internalCluster().getInstance(IndexingPressure.class, primaryName);
IndexingPressure replicaWriteLimits = internalCluster().getInstance(IndexingPressure.class, replicaName);
IndexingPressure coordinatingWriteLimits = internalCluster().getInstance(IndexingPressure.class, coordinatingOnlyNode);
IndexingPressure primaryWriteLimits = internalCluster()
.getInstance(IndexingPressureService.class, primaryName).getShardIndexingPressure();
IndexingPressure replicaWriteLimits = internalCluster()
.getInstance(IndexingPressureService.class, replicaName).getShardIndexingPressure();
IndexingPressure coordinatingWriteLimits = internalCluster()
.getInstance(IndexingPressureService.class, coordinatingOnlyNode).getShardIndexingPressure();

assertBusy(() -> {
assertThat(primaryWriteLimits.getCurrentCombinedCoordinatingAndPrimaryBytes(), greaterThan(bulkShardRequestSize));
Expand Down
Loading