This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 82dc720 Integrate SJK into nodetool
82dc720 is described below
commit 82dc72088f85c7ed7ac7b74ae62cf2b751c8bb64
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Thu Nov 21 09:51:33 2019 -0500
Integrate SJK into nodetool
Patch by Ekaterina Dimotrova, reviewed by brandonwilliams for
CASSANDRA-12197
---
build.xml | 25 +-
lib/jcommander-1.30.jar | Bin 0 -> 60376 bytes
lib/jvm-attach-api-1.5.jar | Bin 0 -> 76025 bytes
lib/licenses/LICENSE-2.0.txt | 202 +++++++++
lib/mxdump-0.14.jar | Bin 0 -> 7377 bytes
lib/sjk-cli-0.14.jar | Bin 0 -> 14194 bytes
lib/sjk-core-0.14.jar | Bin 0 -> 257437 bytes
lib/sjk-json-0.14.jar | Bin 0 -> 40456 bytes
lib/sjk-stacktrace-0.14.jar | Bin 0 -> 267577 bytes
src/java/org/apache/cassandra/tools/NodeProbe.java | 18 +-
src/java/org/apache/cassandra/tools/NodeTool.java | 2 +
.../org/apache/cassandra/tools/nodetool/Sjk.java | 485 +++++++++++++++++++++
.../apache/cassandra/tools/nodetool/TpStats.java | 2 +
13 files changed, 732 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 0050b30..a458023 100644
--- a/build.xml
+++ b/build.xml
@@ -583,6 +583,15 @@
<dependency groupId="org.ow2.asm" artifactId="asm"
version="${asm.version}" />
<dependency groupId="org.ow2.asm" artifactId="asm-tree"
version="${asm.version}" />
<dependency groupId="org.ow2.asm" artifactId="asm-commons"
version="${asm.version}" />
+ <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-cli"
version="0.14"/>
+ <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-core"
version="0.14"/>
+ <dependency groupId="org.gridkit.jvmtool"
artifactId="sjk-stacktrace" version="0.14"/>
+ <dependency groupId="org.gridkit.jvmtool" artifactId="mxdump"
version="0.14"/>
+ <dependency groupId="org.gridkit.lab" artifactId="jvm-attach-api"
version="1.5"/>
+ <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-json"
version="0.14"/>
+
+ <dependency groupId="com.beust" artifactId="jcommander"
version="1.30"/>
+
</dependencyManagement>
<developer id="adelapena" name="Andres de la Peña"/>
<developer id="alakshman" name="Avinash Lakshman"/>
@@ -653,6 +662,13 @@
<dependency groupId="org.openjdk.jmh"
artifactId="jmh-generator-annprocess"/>
<dependency groupId="net.ju-n.compile-command-annotations"
artifactId="compile-command-annotations"/>
<dependency groupId="org.apache.ant" artifactId="ant-junit"
version="1.9.7" />
+ <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-cli" />
+ <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-core" />
+ <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-stacktrace"
/>
+ <dependency groupId="org.gridkit.jvmtool" artifactId="mxdump" />
+ <dependency groupId="org.gridkit.lab" artifactId="jvm-attach-api" />
+ <dependency groupId="com.beust" artifactId="jcommander" />
+ <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-json"/>
</artifact:pom>
<!-- this build-deps-pom-sources "artifact" is the same as
build-deps-pom but only with those
artifacts that have "-source.jar" files -->
@@ -764,7 +780,14 @@
<dependency groupId="com.github.ben-manes.caffeine"
artifactId="caffeine" />
<dependency groupId="org.jctools" artifactId="jctools-core"/>
<dependency groupId="org.ow2.asm" artifactId="asm" />
- <dependency groupId="com.carrotsearch" artifactId="hppc"
version="0.5.4" />
+ <dependency groupId="com.carrotsearch" artifactId="hppc" />
+ <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-cli" />
+ <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-core" />
+ <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-stacktrace"
/>
+ <dependency groupId="org.gridkit.jvmtool" artifactId="mxdump" />
+ <dependency groupId="org.gridkit.lab" artifactId="jvm-attach-api" />
+ <dependency groupId="com.beust" artifactId="jcommander" />
+ <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-json"/>
</artifact:pom>
<artifact:pom id="dist-pom"
artifactId="apache-cassandra"
diff --git a/lib/jcommander-1.30.jar b/lib/jcommander-1.30.jar
new file mode 100644
index 0000000..ec6c420
Binary files /dev/null and b/lib/jcommander-1.30.jar differ
diff --git a/lib/jvm-attach-api-1.5.jar b/lib/jvm-attach-api-1.5.jar
new file mode 100644
index 0000000..e9b5809
Binary files /dev/null and b/lib/jvm-attach-api-1.5.jar differ
diff --git a/lib/licenses/LICENSE-2.0.txt b/lib/licenses/LICENSE-2.0.txt
new file mode 100644
index 0000000..7a4a3ea
--- /dev/null
+++ b/lib/licenses/LICENSE-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/lib/mxdump-0.14.jar b/lib/mxdump-0.14.jar
new file mode 100644
index 0000000..a2b177c
Binary files /dev/null and b/lib/mxdump-0.14.jar differ
diff --git a/lib/sjk-cli-0.14.jar b/lib/sjk-cli-0.14.jar
new file mode 100644
index 0000000..bdc7f86
Binary files /dev/null and b/lib/sjk-cli-0.14.jar differ
diff --git a/lib/sjk-core-0.14.jar b/lib/sjk-core-0.14.jar
new file mode 100644
index 0000000..28fe34f
Binary files /dev/null and b/lib/sjk-core-0.14.jar differ
diff --git a/lib/sjk-json-0.14.jar b/lib/sjk-json-0.14.jar
new file mode 100644
index 0000000..82bf43b
Binary files /dev/null and b/lib/sjk-json-0.14.jar differ
diff --git a/lib/sjk-stacktrace-0.14.jar b/lib/sjk-stacktrace-0.14.jar
new file mode 100644
index 0000000..b6c9242
Binary files /dev/null and b/lib/sjk-stacktrace-0.14.jar differ
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 25bf9c2..77efb0e 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -97,6 +97,7 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.cassandra.tools.nodetool.GetTimeout;
+import org.apache.cassandra.utils.NativeLibrary;
/**
* JMX client operations for Cassandra.
@@ -519,6 +520,11 @@ public class NodeProbe implements AutoCloseable
return ssProxy.effectiveOwnershipWithPort(keyspace);
}
+ public MBeanServerConnection getMbeanServerConn()
+ {
+ return mbeanServerConn;
+ }
+
public CacheServiceMBean getCacheServiceMBean()
{
String cachePath = "org.apache.cassandra.db:type=Caches";
@@ -1296,6 +1302,11 @@ public class NodeProbe implements AutoCloseable
return failed;
}
+ public void failed()
+ {
+ this.failed = true;
+ }
+
public long getReadRepairAttempted()
{
return spProxy.getReadRepairAttempted();
@@ -1670,6 +1681,11 @@ public class NodeProbe implements AutoCloseable
return ssProxy.getLoggingLevels();
}
+ public long getPid()
+ {
+ return NativeLibrary.getProcessID();
+ }
+
public void resumeBootstrap(PrintStream out) throws IOException
{
BootstrapMonitor monitor = new BootstrapMonitor(out);
@@ -1755,7 +1771,7 @@ public class NodeProbe implements AutoCloseable
{
ssProxy.clearConnectionHistory();
}
-
+
public void disableAuditLog()
{
ssProxy.disableAuditLog();
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java
b/src/java/org/apache/cassandra/tools/NodeTool.java
index c1eba6a..e29f228 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -52,6 +52,7 @@ import com.google.common.base.Throwables;
import org.apache.cassandra.locator.EndpointSnitchInfoMBean;
import org.apache.cassandra.tools.nodetool.*;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.tools.nodetool.Sjk;
import com.google.common.collect.Maps;
@@ -197,6 +198,7 @@ public class NodeTool
TopPartitions.class,
SetLoggingLevel.class,
GetLoggingLevels.class,
+ Sjk.class,
DisableHintsForDC.class,
EnableHintsForDC.class,
FailureDetectorInfo.class,
diff --git a/src/java/org/apache/cassandra/tools/nodetool/Sjk.java
b/src/java/org/apache/cassandra/tools/nodetool/Sjk.java
new file mode 100644
index 0000000..f394d38
--- /dev/null
+++ b/src/java/org/apache/cassandra/tools/nodetool/Sjk.java
@@ -0,0 +1,485 @@
+
+package org.apache.cassandra.tools.nodetool;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import javax.management.MBeanServerConnection;
+
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.ParameterDescription;
+import com.beust.jcommander.Parameterized;
+import io.airlift.airline.Arguments;
+import io.airlift.airline.Command;
+import org.gridkit.jvmtool.JmxConnectionInfo;
+import org.gridkit.jvmtool.cli.CommandLauncher;
+
+import org.apache.cassandra.tools.NodeProbe;
+import org.apache.cassandra.tools.NodeTool.NodeToolCmd;
+
+@Command(name = "sjk", description = "Run commands of 'Swiss Java Knife'. Run
'nodetool sjk --help' for more information.")
+public class Sjk extends NodeToolCmd
+{
+ @Arguments(description = "Arguments passed as is to 'Swiss Java Knife'.")
+ private List<String> args;
+
+ private final Wrapper wrapper = new Wrapper();
+
+ public void run()
+ {
+ wrapper.prepare(args != null ? args.toArray(new String[0]) : new
String[]{"help"});
+
+ if (!wrapper.requiresMbeanServerConn())
+ {
+ // SJK command does not require an MBeanServerConnection, so just
invoke it
+ wrapper.run(null);
+ }
+ else
+ {
+ // invoke common nodetool handling to establish
MBeanServerConnection
+ super.run();
+ }
+ }
+
+ public void sequenceRun(NodeProbe probe)
+ {
+ wrapper.prepare(args != null ? args.toArray(new String[0]) : new
String[]{"help"});
+ if (!wrapper.run(probe))
+ probe.failed();
+ }
+
+ protected void execute(NodeProbe probe)
+ {
+ if (!wrapper.run(probe))
+ probe.failed();
+ }
+
+ /**
+ * Adopted copy of {@link org.gridkit.jvmtool.SJK} from <a
href="https://github.com/aragozin/jvm-tools";>https://github.com/aragozin/jvm-tools</a>.
+ */
+ public static class Wrapper extends CommandLauncher
+ {
+ boolean suppressSystemExit;
+
+ private final Map<String, Runnable> commands = new HashMap<>();
+
+ private JCommander parser;
+
+ private Runnable cmd;
+
+ public void suppressSystemExit()
+ {
+ suppressSystemExit = true;
+ super.suppressSystemExit();
+ }
+
+ public boolean start(String[] args)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void prepare(String[] args)
+ {
+ try
+ {
+
+ parser = new JCommander(this);
+
+ addCommands();
+
+ fixCommands();
+
+ try
+ {
+ parser.parse(args);
+ }
+ catch (Exception e)
+ {
+ failAndPrintUsage(e.toString());
+ }
+
+ if (isHelp())
+ {
+ String cmd = parser.getParsedCommand();
+ if (cmd == null)
+ {
+ parser.usage();
+ }
+ else
+ {
+ parser.usage(cmd);
+ }
+ }
+ else if (isListCommands())
+ {
+ for (String cmd : commands.keySet())
+ {
+ System.out.println(String.format("%8s - %s", cmd,
parser.getCommandDescription(cmd)));
+ }
+ }
+ else
+ {
+
+ cmd = commands.get(parser.getParsedCommand());
+
+ if (cmd == null)
+ {
+ failAndPrintUsage();
+ }
+ }
+ }
+ catch (CommandAbortedError error)
+ {
+ for (String m : error.messages)
+ {
+ logError(m);
+ }
+ if (isVerbose() && error.getCause() != null)
+ {
+ logTrace(error.getCause());
+ }
+ if (error.printUsage && parser != null)
+ {
+ if (parser.getParsedCommand() != null)
+ {
+ parser.usage(parser.getParsedCommand());
+ }
+ else
+ {
+ parser.usage();
+ }
+ }
+ }
+ catch (Throwable e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public boolean run(final NodeProbe probe)
+ {
+ try
+ {
+ setJmxConnInfo(probe);
+
+ if (cmd != null)
+ cmd.run();
+
+ return true;
+ }
+ catch (CommandAbortedError error)
+ {
+ for (String m : error.messages)
+ {
+ logError(m);
+ }
+ if (isVerbose() && error.getCause() != null)
+ {
+ logTrace(error.getCause());
+ }
+ if (error.printUsage && parser != null)
+ {
+ if (parser.getParsedCommand() != null)
+ {
+ parser.usage(parser.getParsedCommand());
+ }
+ else
+ {
+ parser.usage();
+ }
+ }
+ return true;
+ }
+ catch (Throwable e)
+ {
+ e.printStackTrace();
+ }
+
+ // abnormal termination
+ return false;
+ }
+
+ private void setJmxConnInfo(final NodeProbe probe) throws
IllegalAccessException
+ {
+ Field f = jmxConnectionInfoField(cmd);
+ if (f != null)
+ {
+ f.setAccessible(true);
+ f.set(cmd, new JmxConnectionInfo(this)
+ {
+ public MBeanServerConnection getMServer()
+ {
+ return probe.getMbeanServerConn();
+ }
+ });
+ }
+ f = pidField(cmd);
+ if (f != null)
+ {
+ long pid = probe.getPid();
+
+ f.setAccessible(true);
+ if (f.getType() == int.class)
+ f.setInt(cmd, (int) pid);
+ if (f.getType() == long.class)
+ f.setLong(cmd, pid);
+ if (f.getType() == String.class)
+ f.set(cmd, Long.toString(pid));
+ }
+ }
+
+ private boolean isHelp()
+ {
+ try
+ {
+ Field f = CommandLauncher.class.getDeclaredField("help");
+ f.setAccessible(true);
+ return f.getBoolean(this);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private boolean isListCommands()
+ {
+ try
+ {
+ Field f =
CommandLauncher.class.getDeclaredField("listCommands");
+ f.setAccessible(true);
+ return f.getBoolean(this);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ protected List<String> getCommandPackages()
+ {
+ return Collections.singletonList("org.gridkit.jvmtool.cmd");
+ }
+
+ private void addCommands() throws InstantiationException,
IllegalAccessException
+ {
+ for (String pack : getCommandPackages())
+ {
+ for (Class<?> c : findClasses(pack))
+ {
+ if (CommandLauncher.CmdRef.class.isAssignableFrom(c))
+ {
+ CommandLauncher.CmdRef cmd = (CommandLauncher.CmdRef)
c.newInstance();
+ String cmdName = cmd.getCommandName();
+ Runnable cmdTask = cmd.newCommand(this);
+ if (commands.containsKey(cmdName))
+ {
+ fail("Ambiguous implementation for '" + cmdName +
'\'');
+ }
+ commands.put(cmdName, cmdTask);
+ parser.addCommand(cmdName, cmdTask);
+ }
+ }
+ }
+ }
+
+ private void fixCommands() throws Exception
+ {
+ List<Field> fields =
Arrays.asList(JCommander.class.getDeclaredField("m_fields"),
+
JCommander.class.getDeclaredField("m_requiredFields"));
+ for (Field f : fields)
+ f.setAccessible(true);
+
+ for (JCommander cmdr : parser.getCommands().values())
+ {
+ for (Field field : fields) {
+ Map<Parameterized, ParameterDescription> fieldsMap =
(Map<Parameterized, ParameterDescription>) field.get(cmdr);
+ for (Iterator<Map.Entry<Parameterized,
ParameterDescription>> iPar = fieldsMap.entrySet().iterator(); iPar.hasNext(); )
+ {
+ Map.Entry<Parameterized, ParameterDescription> par =
iPar.next();
+ switch (par.getKey().getName())
+ {
+ // JmxConnectionInfo fields
+ case "pid":
+ case "sockAddr":
+ case "user":
+ case "password":
+ //
+ case "verbose":
+ case "help":
+ case "listCommands":
+ iPar.remove();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ boolean requiresMbeanServerConn()
+ {
+ return jmxConnectionInfoField(cmd) != null || pidField(cmd) !=
null;
+ }
+
+ private static Field jmxConnectionInfoField(Runnable cmd)
+ {
+ if (cmd == null)
+ return null;
+
+ for (Field f : cmd.getClass().getDeclaredFields())
+ {
+ if (f.getType() == JmxConnectionInfo.class)
+ {
+ return f;
+ }
+ }
+ return null;
+ }
+
+ private static Field pidField(Runnable cmd)
+ {
+ if (cmd == null)
+ return null;
+
+ for (Field f : cmd.getClass().getDeclaredFields())
+ {
+ if ("pid".equals(f.getName()) &&
+ (f.getType() == int.class || f.getType() == long.class ||
f.getType() == String.class))
+ {
+ return f;
+ }
+ }
+ return null;
+ }
+
+ private static List<Class<?>> findClasses(String packageName)
+ {
+ // TODO this will probably fail with JPMS/Jigsaw
+
+ List<Class<?>> result = new ArrayList<>();
+ try
+ {
+ String path = packageName.replace('.', '/');
+ for (String f : findFiles(path))
+ {
+ if (f.endsWith(".class") && f.indexOf('$') < 0)
+ {
+ f = f.substring(0, f.length() - ".class".length());
+ f = f.replace('/', '.');
+ result.add(Class.forName(f));
+ }
+ }
+ return result;
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ static List<String> findFiles(String path) throws IOException
+ {
+ List<String> result = new ArrayList<>();
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ Enumeration<URL> en = cl.getResources(path);
+ while (en.hasMoreElements())
+ {
+ URL u = en.nextElement();
+ listFiles(result, u, path);
+ }
+ return result;
+ }
+
+ static void listFiles(List<String> results, URL packageURL, String
path) throws IOException
+ {
+ if (packageURL.getProtocol().equals("jar"))
+ {
+ String jarFileName;
+ Enumeration<JarEntry> jarEntries;
+ String entryName;
+
+ // build jar file name, then loop through zipped entries
+ jarFileName = URLDecoder.decode(packageURL.getFile(), "UTF-8");
+ jarFileName = jarFileName.substring(5,
jarFileName.indexOf('!'));
+ try (JarFile jf = new JarFile(jarFileName))
+ {
+ jarEntries = jf.entries();
+ while (jarEntries.hasMoreElements())
+ {
+ entryName = jarEntries.nextElement().getName();
+ if (entryName.startsWith(path))
+ {
+ results.add(entryName);
+ }
+ }
+ }
+ }
+ else
+ {
+ // loop through files in classpath
+ File dir = new File(packageURL.getFile());
+ String cp = dir.getCanonicalPath();
+ File root = dir;
+ while (true)
+ {
+ if (cp.equals(new File(root, path).getCanonicalPath()))
+ {
+ break;
+ }
+ root = root.getParentFile();
+ }
+ listFiles(results, root, dir);
+ }
+ }
+
+ static void listFiles(List<String> names, File root, File dir)
+ {
+ String rootPath = root.getAbsolutePath();
+ if (dir.exists() && dir.isDirectory())
+ {
+ for (File file : dir.listFiles())
+ {
+ if (file.isDirectory())
+ {
+ listFiles(names, root, file);
+ }
+ else
+ {
+ String name =
file.getAbsolutePath().substring(rootPath.length() + 1);
+ name = name.replace('\\', '/');
+ names.add(name);
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/java/org/apache/cassandra/tools/nodetool/TpStats.java
b/src/java/org/apache/cassandra/tools/nodetool/TpStats.java
index d7e8f06..307c78d 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/TpStats.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/TpStats.java
@@ -17,6 +17,8 @@
*/
package org.apache.cassandra.tools.nodetool;
+import javax.management.MBeanServerConnection;
+
import io.airlift.airline.Command;
import io.airlift.airline.Option;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
