Skip to content

Commit 373150d

Browse files
committed
merge: pick up OpenSSL bump from #539
2 parents b1157e1 + 81b1c7f commit 373150d

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

.github/actions/install-openssl/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
if: runner.os == 'Windows'
3333
shell: bash
3434
run: |
35-
choco install openssl --version 3.6.2 -y --no-progress
35+
choco install openssl --version 4.0.1 -y --no-progress
3636
if [ -d "C:\Program Files\OpenSSL-Win64" ]; then
3737
echo "OPENSSL_ROOT_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_OUTPUT
3838
else

libs/server-sdk/src/data_systems/fdv2/fdv2_data_system.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@ void FDv2DataSystem::OnInitializerResult(
198198
if (source_manager_.AvailableSynchronizerCount() > 0) {
199199
LD_LOG(logger_, LogLevel::kInfo)
200200
<< Identity() << ": FDv1 fallback engaged";
201+
// No basis yet; reuse the flag to fall through to
202+
// StartSynchronizers so the FDv1 fallback synchronizer can
203+
// produce it.
201204
got_basis = true;
202205
} else {
203206
LD_LOG(logger_, LogLevel::kWarn)
@@ -430,6 +433,11 @@ void FDv2DataSystem::ScheduleFDv2RetryLocked(std::chrono::seconds ttl) {
430433
if (ttl == std::chrono::seconds::zero()) {
431434
return;
432435
}
436+
// Cancel any in-flight retry and start fresh; CancellationSource is
437+
// one-shot, so reusing the same source for successive schedules would
438+
// leak prior timers.
439+
fdv1_fallback_retry_cancel_.Cancel();
440+
fdv1_fallback_retry_cancel_ = async::CancellationSource{};
433441
LD_LOG(logger_, LogLevel::kInfo)
434442
<< Identity() << ": FDv2 retry scheduled in " << ttl.count() << "s";
435443
async::Delay(ioc_, ttl, fdv1_fallback_retry_cancel_.GetToken())

0 commit comments

Comments
 (0)