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

Jump to bottom

[SDKS-7446] Remove stop SSE from destroy when SDK is in polling mode #431

Merged
merged 4 commits into from
Sep 7, 2023
Merged

[SDKS-7446] Remove stop SSE from destroy when SDK is in polling mode #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19ca58a
[SDKS-7446] Remove stop SSE from destroy when SDK is in polling mode
nmayorsplit Sep 5, 2023
eb89370
Update version
nmayorsplit Sep 6, 2023
905afa6
Update version
nmayorsplit Sep 7, 2023
1eb5377
Merge branch 'development' into SDKS-7446
nmayorsplit Sep 7, 2023
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
6 changes: 4 additions & 2 deletions client/src/main/java/io/split/engine/common/SyncManagerImp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,10 @@ public void shutdown() throws IOException {
_shuttedDown.set(true);
_initializationtExecutorService.shutdownNow();
_synchronizer.stopPeriodicFetching();
_pushManager.stop();
_pushMonitorExecutorService.shutdownNow();
if (_streamingEnabledConfig.get()) {
_pushManager.stop();
_pushMonitorExecutorService.shutdownNow();
}
_segmentSynchronizationTaskImp.close();
_log.info("Successful shutdown of segment fetchers");
_splitSynchronizationTask.close();
Expand Down
9 changes: 5 additions & 4 deletions client/src/test/java/io/split/engine/common/SyncManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public void startWithStreamingFalseShouldStartPolling() throws InterruptedExcept
Mockito.verify(_pushManager, Mockito.times(0)).start();

syncManager.shutdown();
Mockito.verify(_pushManager, Mockito.times(0)).stop();
Mockito.verify(_synchronizer, Mockito.times(1)).stopPeriodicDataRecording();
}

Expand All @@ -86,7 +87,7 @@ public void startWithStreamingTrueShouldStartSyncAll() throws InterruptedExcepti
}

@Test
public void onStreamingAvailable() throws InterruptedException, IOException {
public void onStreamingAvailable() throws InterruptedException {
TelemetryStorage telemetryStorage = Mockito.mock(TelemetryStorage.class);
LinkedBlockingQueue<PushManager.Status> messages = new LinkedBlockingQueue<>();
SplitTasks splitTasks = SplitTasks.build(_splitSynchronizationTask, _segmentSynchronizationTaskImp,
Expand All @@ -107,7 +108,7 @@ public void onStreamingAvailable() throws InterruptedException, IOException {
}

@Test
public void onStreamingDisabled() throws InterruptedException, IOException {
public void onStreamingDisabled() throws InterruptedException {
TelemetryStorage telemetryStorage = new InMemoryTelemetryStorage();
LinkedBlockingQueue<PushManager.Status> messsages = new LinkedBlockingQueue<>();
SplitTasks splitTasks = SplitTasks.build(_splitSynchronizationTask, _segmentSynchronizationTaskImp,
Expand All @@ -127,7 +128,7 @@ public void onStreamingDisabled() throws InterruptedException, IOException {
}

@Test
public void onStreamingShutdown() throws InterruptedException, IOException {
public void onStreamingShutdown() throws InterruptedException {
TelemetryStorage telemetryStorage = new InMemoryTelemetryStorage();
LinkedBlockingQueue<PushManager.Status> messsages = new LinkedBlockingQueue<>();
SplitTasks splitTasks = SplitTasks.build(_splitSynchronizationTask, _segmentSynchronizationTaskImp,
Expand Down Expand Up @@ -229,4 +230,4 @@ public void syncAllRetryThenShouldStartPolling() throws InterruptedException, IO
syncManager.shutdown();
Mockito.verify(_synchronizer, Mockito.times(1)).stopPeriodicDataRecording();
}
}
}