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

ARTEMIS-2527 Stop executors on print-data

This commit is contained in:
Clebert Suconic 2019-10-23 15:57:49 -04:00
parent 4f3df1f1e4
commit d7dc8b8de8
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java
View File

@ -175,16 +175,17 @@ public class PrintData extends DBOption {
} }
private static void printPages(File pageDirectory, DescribeJournal describeJournal, PrintStream out, boolean safe) { private static void printPages(File pageDirectory, DescribeJournal describeJournal, PrintStream out, boolean safe) {
try { ActiveMQThreadFactory daemonFactory = new ActiveMQThreadFactory("cli", true, PrintData.class.getClassLoader());
final ScheduledExecutorService scheduled = Executors.newScheduledThreadPool(1, daemonFactory);
ScheduledExecutorService scheduled = Executors.newScheduledThreadPool(1, ActiveMQThreadFactory.defaultThreadFactory()); final ExecutorService executor = Executors.newFixedThreadPool(10, daemonFactory);
final ExecutorService executor = Executors.newFixedThreadPool(10, ActiveMQThreadFactory.defaultThreadFactory());
ExecutorFactory execfactory = new ExecutorFactory() { ExecutorFactory execfactory = new ExecutorFactory() {
@Override @Override
public ArtemisExecutor getExecutor() { public ArtemisExecutor getExecutor() {
return ArtemisExecutor.delegate(executor); return ArtemisExecutor.delegate(executor);
} }
}; };
try {
final StorageManager sm = new NullStorageManager(); final StorageManager sm = new NullStorageManager();
PagingStoreFactory pageStoreFactory = new PagingStoreFactoryNIO(sm, pageDirectory, 1000L, scheduled, execfactory, false, null); PagingStoreFactory pageStoreFactory = new PagingStoreFactoryNIO(sm, pageDirectory, 1000L, scheduled, execfactory, false, null);
HierarchicalRepository<AddressSettings> addressSettingsRepository = new HierarchicalObjectRepository<>(); HierarchicalRepository<AddressSettings> addressSettingsRepository = new HierarchicalObjectRepository<>();
@ -194,6 +195,9 @@ public class PrintData extends DBOption {
printPages(describeJournal, sm, manager, out, safe); printPages(describeJournal, sm, manager, out, safe);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally {
executor.shutdownNow();
scheduled.shutdownNow();
} }
} }