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

refactor(search): refactor NUM_RETRIES in esindexbuilder to be configurable #3870

Merged
merged 6 commits into from
Jan 17, 2022
Merged

refactor(search): refactor NUM_RETRIES in esindexbuilder to be configurable #3870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c44a7a
refactor(search): refactor NUM_RETRIES in esindexbuilder to be config…
Jan 11, 2022
0c1f27d
refactor(search): refactor NUM_RETRIES in esindexbuilder to be config…
Jan 11, 2022
c6f9494
change the way of refactor
Jan 12, 2022
6a3d75f
add env var in yml file
Jan 12, 2022
39ce433
rename the env variable
Jan 13, 2022
d2d993d
fix test fail on line 100 in ElasticSearchServiceTest.java
Jan 14, 2022
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
4 changes: 2 additions & 2 deletions ...src/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/ESIndexBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public class ESIndexBuilder {
private final RestHighLevelClient searchClient;
private final int numShards;
private final int numReplicas;
private final int numRetries;

private static final int NUM_RETRIES = 3;
private static final List<String> SETTINGS_TO_COMPARE = ImmutableList.of("number_of_shards", "number_of_replicas");

public void buildIndex(String indexName, Map<String, Object> mappings, Map<String, Object> settings)
Expand Down Expand Up @@ -128,7 +128,7 @@ public void buildIndex(String indexName, Map<String, Object> mappings, Map<Strin
// There can be some delay between the reindex finishing and count being fully up to date, so try multiple times
long originalCount = 0;
long reindexedCount = 0;
for (int i = 0; i < NUM_RETRIES; i++) {
for (int i = 0; i < this.numRetries; i++) {
// Check if reindex succeeded by comparing document counts
originalCount = getCount(indexName);
reindexedCount = getCount(tempIndexName);
Expand Down
2 changes: 1 addition & 1 deletion ...io/src/test/java/com/linkedin/metadata/search/elasticsearch/ElasticSearchServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public static BulkProcessor getBulkProcessor(RestHighLevelClient searchClient) {
}

public static ESIndexBuilder getIndexBuilder(RestHighLevelClient searchClient) {
return new ESIndexBuilder(searchClient, 1, 1);
return new ESIndexBuilder(searchClient, 1, 1, 3);
}

@Nonnull
Expand Down
5 changes: 4 additions & 1 deletion ...ories/src/main/java/com/linkedin/gms/factory/search/ElasticSearchIndexBuilderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@ public class ElasticSearchIndexBuilderFactory {
@Value("${elasticsearch.index.numReplicas}")
private Integer numReplicas;

@Value("${elasticsearch.index.numRetries}")
private Integer numRetries;

@Bean(name = "elasticSearchIndexBuilder")
@Nonnull
protected ESIndexBuilder getInstance() {
return new ESIndexBuilder(searchClient, numShards, numReplicas);
return new ESIndexBuilder(searchClient, numShards, numReplicas, numRetries);
}
}
1 change: 1 addition & 0 deletions metadata-service/factories/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ elasticsearch:
prefix: ${INDEX_PREFIX:}
numShards: ${ELASTICSEARCH_NUM_SHARDS_PER_INDEX:1}
numReplicas: ${ELASTICSEARCH_NUM_REPLICAS_PER_INDEX:1}
numRetries: ${ELASTICSEARCH_INDEX_BUILDER_NUM_RETRIES :3}
maxArrayLength: ${SEARCH_DOCUMENT_MAX_ARRAY_LENGTH:1000}

# TODO: Kafka topic convention
Expand Down