Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #2075

This commit is contained in:
Clebert Suconic 2018-05-07 10:23:36 -04:00
parent 26ccd63b1d d31d6e8131
commit 88b1371e98
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
View File

@ -239,8 +239,10 @@ public class PageCursorProviderImpl implements PageCursorProvider {
for (PageSubscription cursor : activeCursors.values()) {
cursor.stop();
}
executor.shutdownNow();
final int pendingCleanupTasks = scheduledCleanup.get();
if (pendingCleanupTasks > 0) {
logger.tracef("Stopping with %d cleanup tasks to be completed yet", pendingCleanupTasks);
}
}
private void waitForFuture() {

16
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
View File

@ -348,11 +348,23 @@ public class PagingStoreImpl implements PagingStore {
@Override
public synchronized void stop() throws Exception {
if (running) {
cursorProvider.flushExecutors();
cursorProvider.stop();
running = false;
final List<Runnable> pendingTasks = new ArrayList<>();
final int pendingTasksWhileShuttingDown = executor.shutdownNow(pendingTasks::add);
if (pendingTasksWhileShuttingDown > 0) {
logger.tracef("Try executing %d pending tasks on stop", pendingTasksWhileShuttingDown);
for (Runnable pendingTask : pendingTasks) {
try {
pendingTask.run();
} catch (Throwable t) {
logger.warn("Error while executing a pending task on shutdown", t);
}
}
}
executor.shutdownNow();
running = false;
if (currentPage != null) {
currentPage.close(false);