-
Notifications
You must be signed in to change notification settings - Fork 762
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
improve suggester throughput (#4539)
- eliminate the locking done at Suggester level - use single thread pool for init/rebuild - add tunable for the search pool parallelism fixes #4538 fixes #3347
- Loading branch information
Showing
6 changed files
with
237 additions
and
170 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ | |
| */ | ||
|
|
||
| /* | ||
| * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. | ||
| * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. | ||
| * Portions Copyright (c) 2019, Chris Fraire <[email protected]>. | ||
| */ | ||
| package org.opengrok.indexer.configuration; | ||
|
|
@@ -51,6 +51,7 @@ public class SuggesterConfig { | |
| public static final int BUILD_TERMINATION_TIME_DEFAULT = 1800; // half an hour should be enough | ||
| public static final int TIME_THRESHOLD_DEFAULT = 2000; // 2 sec | ||
| public static final int REBUILD_THREAD_POOL_PERCENT_NCPUS_DEFAULT = 80; | ||
| public static final int SEARCH_THREAD_POOL_PERCENT_NCPUS_DEFAULT = 90; | ||
|
|
||
| private static final Set<String> allowedProjectsDefault = null; | ||
| private static final Set<String> allowedFieldsDefault = Set.of( | ||
|
|
@@ -141,6 +142,11 @@ public class SuggesterConfig { | |
| */ | ||
| private int rebuildThreadPoolSizeInNcpuPercent; | ||
|
|
||
| /** | ||
| * Number of threads used for search pool expressed in percent of available CPUs in the system. | ||
| */ | ||
| private int searchThreadPoolSizeInNcpuPercent; | ||
|
|
||
| public SuggesterConfig() { | ||
| setEnabled(ENABLED_DEFAULT); | ||
| setMaxResults(MAX_RESULTS_DEFAULT); | ||
|
|
@@ -157,6 +163,7 @@ public SuggesterConfig() { | |
| setRebuildCronConfig(REBUILD_CRON_CONFIG_DEFAULT); | ||
| setBuildTerminationTime(BUILD_TERMINATION_TIME_DEFAULT); | ||
| setRebuildThreadPoolSizeInNcpuPercent(REBUILD_THREAD_POOL_PERCENT_NCPUS_DEFAULT); | ||
| setSearchThreadPoolSizeInNcpuPercent(SEARCH_THREAD_POOL_PERCENT_NCPUS_DEFAULT); | ||
| } | ||
|
|
||
| public boolean isEnabled() { | ||
|
|
@@ -302,6 +309,17 @@ public int getRebuildThreadPoolSizeInNcpuPercent() { | |
| return rebuildThreadPoolSizeInNcpuPercent; | ||
| } | ||
|
|
||
| public void setSearchThreadPoolSizeInNcpuPercent(final int percent) { | ||
| if (percent < 0 || percent > 100) { | ||
| throw new IllegalArgumentException("Need percentage value"); | ||
| } | ||
| this.searchThreadPoolSizeInNcpuPercent = percent; | ||
| } | ||
|
|
||
| public int getSearchThreadPoolSizeInNcpuPercent() { | ||
| return searchThreadPoolSizeInNcpuPercent; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
|
|
@@ -355,6 +373,8 @@ static SuggesterConfig getForHelp() { | |
| res.setRebuildCronConfig("1 0 * * *"); | ||
| res.setBuildTerminationTime(1 + res.getBuildTerminationTime()); | ||
| res.setRebuildThreadPoolSizeInNcpuPercent(1 + res.getRebuildThreadPoolSizeInNcpuPercent()); | ||
| res.setSearchThreadPoolSizeInNcpuPercent(1 + res.getSearchThreadPoolSizeInNcpuPercent()); | ||
|
|
||
| return res; | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ | |
| */ | ||
|
|
||
| /* | ||
| * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. | ||
| * Portions Copyright (c) 2019, 2020, Chris Fraire <[email protected]>. | ||
| */ | ||
| package org.opengrok.web.api.v1.controller; | ||
|
|
@@ -33,7 +33,6 @@ | |
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.opengrok.suggest.Suggester; | ||
| import org.opengrok.indexer.configuration.RuntimeEnvironment; | ||
| import org.opengrok.indexer.configuration.SuggesterConfig; | ||
| import org.opengrok.indexer.index.Indexer; | ||
|
|
@@ -43,13 +42,10 @@ | |
| import org.opengrok.web.api.v1.suggester.provider.service.impl.SuggesterServiceImpl; | ||
|
|
||
| import java.io.File; | ||
| import java.lang.reflect.Field; | ||
| import java.util.Collections; | ||
| import java.util.Map; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.awaitility.Awaitility.await; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.containsInAnyOrder; | ||
|
|
||
|
|
@@ -91,23 +87,12 @@ public static void tearDownClass() { | |
| } | ||
|
|
||
| @BeforeEach | ||
| void before() { | ||
| await().atMost(15, TimeUnit.SECONDS).until(() -> getSuggesterProjectDataSize() == 1); | ||
| void before() throws Exception { | ||
| SuggesterServiceImpl.getInstance().waitForInit(15, TimeUnit.SECONDS); | ||
|
|
||
| env.setSuggesterConfig(new SuggesterConfig()); | ||
| } | ||
|
|
||
| private static int getSuggesterProjectDataSize() throws Exception { | ||
| Field f = SuggesterServiceImpl.class.getDeclaredField("suggester"); | ||
| f.setAccessible(true); | ||
| Suggester suggester = (Suggester) f.get(SuggesterServiceImpl.getInstance()); | ||
|
|
||
| Field f2 = Suggester.class.getDeclaredField("projectData"); | ||
| f2.setAccessible(true); | ||
|
|
||
| return ((Map) f2.get(suggester)).size(); | ||
| } | ||
|
|
||
| @Test | ||
| void suggestionsSimpleTest() { | ||
| SuggesterControllerTest.Result res = target(SuggesterController.PATH) | ||
|
|
||
Oops, something went wrong.