Skip to content

Commit

Permalink
Revert "Add Shard Level Indexing Pressure (opensearch-project#1336) (o…
Browse files Browse the repository at this point in the history 
…pensearch-project#1343)"

This reverts commit 11237da.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
  • Loading branch information
@nknize
nknize committed Nov 18, 2021
1 parent c459282 commit 445a9d5
Show file tree
Hide file tree
Showing 51 changed files with 90 additions and 8,209 deletions.
297 changes: 0 additions & 297 deletions qa/smoke-test-http/src/test/java/org/opensearch/http/ShardIndexingPressureRestIT.java
View file

This file was deleted.

6 changes: 0 additions & 6 deletions ...rTest/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,6 @@ private void verifyShardInfo(XContentParser parser, boolean primary, boolean inc
|| parser.currentName().equals("name")
|| parser.currentName().equals("transport_address")
|| parser.currentName().equals("weight_ranking")
|| parser.currentName().equals("attributes")
);
// Skip past attributes object
if (parser.currentName().equals("attributes")) {
Expand Down Expand Up @@ -1544,11 +1543,6 @@ 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
35 changes: 10 additions & 25 deletions server/src/internalClusterTest/java/org/opensearch/index/IndexingPressureIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,9 @@ 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();
return Settings.builder().put(super.nodeSettings(nodeOrdinal)).put(unboundedWriteQueue).build();
}

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

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

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

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

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

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

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

0 comments on commit 445a9d5

Please sign in to comment.