Skip to content

Improve binary search for apply-load. #5123

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

Open
dmkozh wants to merge 1 commit into
base: master
Choose a base branch
from
+761 −164
Open

Improve binary search for apply-load. #5123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Builds/VisualStudio/stellar-core.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,7 @@ exit /b 0
<ClCompile Include="..\..\src\invariant\AccountSubEntriesCountIsValid.cpp" />
<ClCompile Include="..\..\src\invariant\ArchivedStateConsistency.cpp" />
<ClCompile Include="..\..\src\invariant\BucketListIsConsistentWithDatabase.cpp" />
<ClCompile Include="..\..\src\invariant\BucketListStateConsistency.cpp" />
<ClCompile Include="..\..\src\invariant\ConservationOfLumens.cpp" />
<ClCompile Include="..\..\src\invariant\ConstantProductInvariant.cpp" />
<ClCompile Include="..\..\src\invariant\EventsAreConsistentWithEntryDiffs.cpp" />
Expand Down Expand Up @@ -1045,6 +1046,7 @@ exit /b 0
<ClInclude Include="..\..\src\invariant\AccountSubEntriesCountIsValid.h" />
<ClInclude Include="..\..\src\invariant\ArchivedStateConsistency.h" />
<ClInclude Include="..\..\src\invariant\BucketListIsConsistentWithDatabase.h" />
<ClInclude Include="..\..\src\invariant\BucketListStateConsistency.h" />
<ClInclude Include="..\..\src\invariant\ConservationOfLumens.h" />
<ClInclude Include="..\..\src\invariant\ConstantProductInvariant.h" />
<ClInclude Include="..\..\src\invariant\EventsAreConsistentWithEntryDiffs.h" />
Expand Down
12 changes: 12 additions & 0 deletions Builds/VisualStudio/stellar-core.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,6 +1423,12 @@
<ClCompile Include="..\..\src\invariant\ArchivedStateConsistency.cpp">
<Filter>invariant</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ledger\LedgerEntryScope.cpp" />
<ClCompile Include="..\..\src\util\MetricsRegistry.cpp" />
<ClCompile Include="..\..\src\util\SimpleTimer.cpp" />
<ClCompile Include="..\..\src\invariant\BucketListStateConsistency.cpp">
<Filter>invariant</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\lib\util\cpptoml.h">
Expand Down Expand Up @@ -2524,6 +2530,12 @@
<ClInclude Include="..\..\src\invariant\ArchivedStateConsistency.h">
<Filter>invariant</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ledger\LedgerEntryScope.h" />
<ClInclude Include="..\..\src\util\MetricsRegistry.h" />
<ClInclude Include="..\..\src\util\SimpleTimer.h" />
<ClInclude Include="..\..\src\invariant\BucketListStateConsistency.h">
<Filter>invariant</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\AUTHORS" />
Expand Down
11 changes: 6 additions & 5 deletions src/main/CommandLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,19 +1936,20 @@ runApplyLoad(CommandLineArgs const& args)
config.TESTING_UPGRADE_MAX_TX_SET_SIZE = 1000;
config.LEDGER_PROTOCOL_VERSION =
Config::CURRENT_LEDGER_PROTOCOL_VERSION;
if (config.APPLY_LOAD_NUM_LEDGERS == 0)
if (config.APPLY_LOAD_NUM_LEDGERS < 30)
{
throw std::runtime_error(
"APPLY_LOAD_NUM_LEDGERS must be greater than 0");
"APPLY_LOAD_NUM_LEDGERS must be at least 30");
}
if (mode == ApplyLoadMode::MAX_SAC_TPS)
{
if (config.APPLY_LOAD_MAX_SAC_TPS_MIN_TPS >=
if (config.APPLY_LOAD_MAX_SAC_TPS_MIN_TPS >
config.APPLY_LOAD_MAX_SAC_TPS_MAX_TPS)
{
throw std::runtime_error(
"APPLY_LOAD_MAX_SAC_TPS_MIN_TPS must be less than "
"APPLY_LOAD_MAX_SAC_TPS_MAX_TPS for max_sac_tps mode");
"APPLY_LOAD_MAX_SAC_TPS_MIN_TPS must not be greater "
"than APPLY_LOAD_MAX_SAC_TPS_MAX_TPS for max_sac_tps "
"mode");
}

// For now, metrics are expensive at high, parallel load. We
Expand Down
9 changes: 0 additions & 9 deletions src/main/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1752,15 +1752,6 @@ Config::processConfig(std::shared_ptr<cpptoml::table> t)
[&]() {
APPLY_LOAD_TARGET_CLOSE_TIME_MS =
readInt<uint32_t>(item, 1);
if (APPLY_LOAD_TARGET_CLOSE_TIME_MS %
ApplyLoad::TARGET_CLOSE_TIME_STEP_MS !=
0)
{
throw std::invalid_argument(fmt::format(
FMT_STRING("APPLY_LOAD_TARGET_CLOSE_TIME_MS "
"must be a multiple of {}."),
ApplyLoad::TARGET_CLOSE_TIME_STEP_MS));
}
}},
{"APPLY_LOAD_MAX_SAC_TPS_MIN_TPS",
[&]() {
Expand Down
Loading
Loading