You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/12/16 16:55:32 UTC
[1/2] karaf git commit: [KARAF-4193] Add option to dev:dump-create
command (and MBean) to exclude heap and thread dumps
Repository: karaf
Updated Branches:
refs/heads/master a71b7f56a -> b4195b6b6
[KARAF-4193] Add option to dev:dump-create command (and MBean) to exclude heap and thread dumps
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9ac60250
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9ac60250
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9ac60250
Branch: refs/heads/master
Commit: 9ac602506f74a5fb91e1ada972469c19d882e1c9
Parents: b9c42b5
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Dec 15 14:37:31 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Dec 15 15:06:33 2015 +0100
----------------------------------------------------------------------
.../org/apache/karaf/diagnostic/core/Dump.java | 6 +++---
.../diagnostic/core/internal/DumpHandler.java | 2 +-
.../karaf/diagnostic/command/DumpCommand.java | 8 +++++++-
.../diagnostic/management/DiagnosticDumpMBean.java | 2 +-
.../internal/DiagnosticDumpMBeanImpl.java | 6 +++---
.../org/apache/karaf/itests/DiagnosticTest.java | 17 ++++++++++++++++-
6 files changed, 31 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/9ac60250/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/Dump.java
----------------------------------------------------------------------
diff --git a/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/Dump.java b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/Dump.java
index ab20fd0..fd79511 100644
--- a/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/Dump.java
+++ b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/Dump.java
@@ -44,12 +44,12 @@ public final class Dump {
return new ZipDumpDestination(file);
}
- public static void dump(BundleContext bundleContext, DumpDestination destination) {
+ public static void dump(BundleContext bundleContext, DumpDestination destination, boolean noThreadDump, boolean noHeapDump) {
List<DumpProvider> providers = new ArrayList<DumpProvider>();
providers.add(new EnvironmentDumpProvider(bundleContext));
providers.add(new MemoryDumpProvider());
- providers.add(new ThreadDumpProvider());
- providers.add(new HeapDumpProvider());
+ if (!noThreadDump) providers.add(new ThreadDumpProvider());
+ if (!noHeapDump) providers.add(new HeapDumpProvider());
providers.add(new BundleDumpProvider(bundleContext));
for (DumpProvider provider : providers) {
try {
http://git-wip-us.apache.org/repos/asf/karaf/blob/9ac60250/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/DumpHandler.java
----------------------------------------------------------------------
diff --git a/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/DumpHandler.java b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/DumpHandler.java
index 7ec1f00..a70371c 100644
--- a/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/DumpHandler.java
+++ b/diagnostic/boot/src/main/java/org/apache/karaf/diagnostic/core/internal/DumpHandler.java
@@ -44,7 +44,7 @@ public class DumpHandler implements SignalHandler, Closeable {
SimpleDateFormat dumpFormat = new SimpleDateFormat("yyyy-MM-dd_HHmmss-SSS");
String fileName = "dump-" + dumpFormat.format(new Date()) + ".zip";
DumpDestination destination = new ZipDumpDestination(new File(fileName));
- Dump.dump(context, destination);
+ Dump.dump(context, destination, false, false);
}
@Override
http://git-wip-us.apache.org/repos/asf/karaf/blob/9ac60250/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/command/DumpCommand.java
----------------------------------------------------------------------
diff --git a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/command/DumpCommand.java b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/command/DumpCommand.java
index 258c5ef..20a66a2 100644
--- a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/command/DumpCommand.java
+++ b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/command/DumpCommand.java
@@ -49,6 +49,12 @@ public class DumpCommand implements Action {
@Option(name = "-d", aliases = "--directory", description = "Creates dump in a directory in place of a ZIP archive")
boolean directory;
+ @Option(name = "--no-thread-dump", description = "Include or not the thread dump in ZIP archive")
+ boolean noThreadDump = false;
+
+ @Option(name = "--no-heap-dump", description = "Include or not the heap dump in ZIP archive")
+ boolean noHeapDump = false;
+
/**
* Name of created directory or archive.
*/
@@ -78,7 +84,7 @@ public class DumpCommand implements Action {
destination = Dump.zip(target);
}
- Dump.dump(bundleContext, destination);
+ Dump.dump(bundleContext, destination, noThreadDump, noHeapDump);
System.out.println("Created dump " + destination.toString());
return null;
http://git-wip-us.apache.org/repos/asf/karaf/blob/9ac60250/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java
----------------------------------------------------------------------
diff --git a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java
index 6713d65..e5dfc99 100644
--- a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java
+++ b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java
@@ -37,6 +37,6 @@ public interface DiagnosticDumpMBean {
* @param name Name of the dump.
* @throws Exception In case of any problems.
*/
- void createDump(boolean directory, String name) throws MBeanException;
+ void createDump(boolean directory, String name, boolean noThreadDump, boolean noHeapDump) throws MBeanException;
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/9ac60250/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java
----------------------------------------------------------------------
diff --git a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java
index bf8903d..a7758e1 100644
--- a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java
+++ b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java
@@ -56,13 +56,13 @@ public class DiagnosticDumpMBeanImpl extends StandardMBean implements Diagnostic
* @param name Name of the dump.
*/
public void createDump(String name) {
- createDump(false, name);
+ createDump(false, name, false, false);
}
/**
* {@inheritDoc}
*/
- public void createDump(boolean directory, String name) {
+ public void createDump(boolean directory, String name, boolean noThreadDump, boolean noHeapDump) {
if (name == null || name.trim().length() == 0) {
name = dumpFormat.format(new Date());
if (!directory) {
@@ -78,7 +78,7 @@ public class DiagnosticDumpMBeanImpl extends StandardMBean implements Diagnostic
destination = Dump.zip(target);
}
- Dump.dump(bundleContext, destination);
+ Dump.dump(bundleContext, destination, noThreadDump, noHeapDump);
LOGGER.info("Created dump " + destination.toString());
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/9ac60250/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java b/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java
index 4f78113..cb844bd 100644
--- a/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java
@@ -31,7 +31,22 @@ public class DiagnosticTest extends KarafTestSupport {
public void dumpCreateCommand() throws Exception {
assertContains("Created dump zip", executeCommand("dev:dump-create"));
}
-
+
+ @Test
+ public void dumpCreateCommandNoHeapDump() throws Exception {
+ assertContains("Created dump zip", executeCommand("dev:dump-create --no-heap-dump"));
+ }
+
+ @Test
+ public void dumpCreateCommandNoThreadDump() throws Exception {
+ assertContains("Created dump zip", executeCommand("dev:dump-create --no-thread-dump"));
+ }
+
+ @Test
+ public void dumpCreateCommandNoHeapAndThreadDump() throws Exception {
+ assertContains("Created dump zip", executeCommand("dev:dump-create --no-heap-dump --no-thread-dump"));
+ }
+
@Test
public void createDumpViaMBean() throws Exception {
JMXConnector connector = null;
[2/2] karaf git commit: Merge branch 'KARAF-4193' of
https://github.com/oscerd/karaf
Posted by jb...@apache.org.
Merge branch 'KARAF-4193' of https://github.com/oscerd/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b4195b6b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b4195b6b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b4195b6b
Branch: refs/heads/master
Commit: b4195b6b6bf7d98e078b3cbd488e32732e8c62bf
Parents: a71b7f5 9ac6025
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Dec 16 13:27:47 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Dec 16 13:27:47 2015 +0100
----------------------------------------------------------------------
.../org/apache/karaf/diagnostic/core/Dump.java | 6 +++---
.../diagnostic/core/internal/DumpHandler.java | 2 +-
.../karaf/diagnostic/command/DumpCommand.java | 8 +++++++-
.../diagnostic/management/DiagnosticDumpMBean.java | 2 +-
.../internal/DiagnosticDumpMBeanImpl.java | 6 +++---
.../org/apache/karaf/itests/DiagnosticTest.java | 17 ++++++++++++++++-
6 files changed, 31 insertions(+), 10 deletions(-)
----------------------------------------------------------------------