honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust keep alive assertion in ShardSearchRequest (#62582) 

Relates #62184
This commit is contained in:
Nhat Nguyen 2020-09-17 14:53:12 -04:00
parent ede62d722f
commit 0127b71901
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java
View File

@ -224,7 +224,7 @@ public class ShardSearchRequest extends TransportRequest implements IndicesReque
this.keepAlive = null;
}
originalIndices = OriginalIndices.readOriginalIndices(in);
assert (readerId != null) == (keepAlive != null);
assert keepAlive == null || readerId != null : "readerId: " + readerId + " keepAlive: " + keepAlive;
}
public ShardSearchRequest(ShardSearchRequest clone) {

12
server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java
View File

@ -26,8 +26,10 @@ import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.UUIDs;
import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
@ -94,9 +96,17 @@ public class ShardSearchRequestTests extends AbstractSearchTestCase {
filteringAliases = new AliasFilter(null, Strings.EMPTY_ARRAY);
}
final String[] routings = generateRandomStringArray(5, 10, false, true);
ShardSearchContextId shardSearchContextId = null;
TimeValue keepAlive = null;
if (randomBoolean()) {
shardSearchContextId = new ShardSearchContextId(UUIDs.randomBase64UUID(), randomNonNegativeLong());
if (randomBoolean()) {
keepAlive = TimeValue.timeValueSeconds(randomIntBetween(0, 120));
}
}
ShardSearchRequest req = new ShardSearchRequest(new OriginalIndices(searchRequest), searchRequest, shardId,
randomIntBetween(1, 100), filteringAliases, randomBoolean() ? 1.0f : randomFloat(),
Math.abs(randomLong()), randomAlphaOfLengthBetween(3, 10), routings);
Math.abs(randomLong()), randomAlphaOfLengthBetween(3, 10), routings, shardSearchContextId, keepAlive);
req.canReturnNullResponseIfMatchNoDocs(randomBoolean());
if (randomBoolean()) {
req.setBottomSortValues(SearchSortValuesAndFormatsTests.randomInstance());