Skip to content

CASSANDRA-20884 - Move JMX classes to the in-jvm-dtest API project #4369

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

Draft
wants to merge 2 commits into
base: cassandra-5.0
Choose a base branch
from
Draft

CASSANDRA-20884 - Move JMX classes to the in-jvm-dtest API project #4369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac9c288
CASSANDRA-20884 - Move JMX classes to the in-jvm-dtest API project
JeetKunDoug Sep 2, 2025
74fc7ae
Use published snapshot for testing of dtest-api 0.0.18
JeetKunDoug Oct 1, 2025
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
3 changes: 2 additions & 1 deletion .build/build-resolver.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
or ~/.ant/settings.xml (maven ant resolver supersedes) as mirrors will, by default, catch and override
all dependency resolution regardless of it being a -SNAPSHOT lib or not.
-->
<!-- <remoterepo id="resolver-apache-snapshot" url="${artifact.remoteRepository.apacheSnapshot}" releases="false" snapshots="true" updates="always" checksums="fail" /> -->
<!-- TODO: Do not merge. Only for use until dtest-api 0.0.18 is released -->
<remoterepo id="resolver-apache-snapshot" url="${artifact.remoteRepository.apacheSnapshot}" releases="false" snapshots="true" updates="always" checksums="fail" />
</resolver:remoterepos>

<macrodef name="resolve">
Expand Down
2 changes: 1 addition & 1 deletion .build/parent-pom-template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>dtest-api</artifactId>
<version>0.0.16</version>
<version>0.0.18-cd80924-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
81 changes: 0 additions & 81 deletions src/java/org/apache/cassandra/utils/RMIClientSocketFactoryImpl.java
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,6 @@ public AbstractBuilder(Factory<I, C, B> factory)
withSharedClasses(SHARED_PREDICATE);
}

@SuppressWarnings("unchecked")
private B self()
{
return (B) this;
}

public B withNodeProvisionStrategy(INodeProvisionStrategy.Strategy nodeProvisionStrategy)
{
this.nodeProvisionStrategy = nodeProvisionStrategy;
Expand Down Expand Up @@ -585,7 +579,7 @@ public InstanceConfig newInstanceConfig()
}

@VisibleForTesting
InstanceConfig createInstanceConfig(int nodeNum)
public InstanceConfig createInstanceConfig(int nodeNum)
{
INodeProvisionStrategy provisionStrategy = nodeProvisionStrategy.create(subnet, portMap);
Collection<String> tokens = tokenSupplier.tokens(nodeNum);
Expand Down
88 changes: 0 additions & 88 deletions ...stributed/org/apache/cassandra/distributed/impl/CollectingRMIServerSocketFactoryImpl.java
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions test/distributed/org/apache/cassandra/distributed/impl/IsolatedJmx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,17 @@
import javax.management.remote.rmi.RMIConnectorServer;
import javax.management.remote.rmi.RMIJRMPServerImpl;

import com.google.common.util.concurrent.Uninterruptibles;

import org.apache.cassandra.distributed.shared.jmx.CollectingRMIServerSocketFactoryImpl;
import org.apache.cassandra.distributed.shared.jmx.RMIClientSocketFactoryImpl;
import org.slf4j.Logger;

import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.cassandra.distributed.api.IInstance;
import org.apache.cassandra.distributed.api.IInstanceConfig;
import org.apache.cassandra.distributed.shared.JMXUtil;
import org.apache.cassandra.utils.JMXServerUtils;
import org.apache.cassandra.utils.MBeanWrapper;
import org.apache.cassandra.utils.RMIClientSocketFactoryImpl;
import sun.rmi.transport.tcp.TCPEndpoint;

import static org.apache.cassandra.config.CassandraRelevantProperties.JAVA_RMI_DGC_LEASE_VALUE_IN_JVM_DTEST;
Expand Down