natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-5.0' into trunk 

This commit only contains in-jvm dtest, logically same as in 5.0, which is ignored as it would fail.
It was identified as part of CASSANDRA-19902 review that trunk branch returns STARTING instead of JOINING operation mode.
This discrepancy between 5.x and trunk is meant to be solved under CASSANDRA-20795.
This commit is contained in:
Stefan Miklosovic 2025-07-28 09:31:59 +02:00
parent 94b251f3ce 07163cfb51
commit 87069e4dec
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
1 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java
View File

@ -21,6 +21,10 @@ package org.apache.cassandra.distributed.test.ring;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import javax.management.MBeanAttributeInfo;
@ -29,6 +33,7 @@ import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
import org.junit.Ignore;
import org.junit.Test;
import net.bytebuddy.ByteBuddy;
@ -47,6 +52,9 @@ import org.apache.cassandra.distributed.shared.NetworkTopology;
import org.apache.cassandra.distributed.test.TestBaseImpl;
import org.apache.cassandra.metrics.DefaultNameFactory;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.service.StorageServiceMBean;
import org.apache.cassandra.utils.Closeable;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static org.apache.cassandra.config.CassandraRelevantProperties.RESET_BOOTSTRAP_PROGRESS;
@ -290,4 +298,81 @@ public class BootstrapTest extends TestBaseImpl
}
}
/**
* This regression test for CASSANDRA-19902 ensures {@link StorageServiceMBean} JMX
* interface is published before the node finishes bootstrapping
*/
@Test
@Ignore("FIXME: CASSANDRA-20795 Operation mode is STARTING instead of JOINING during bootstrap")
public void testStorageServiceMBeanIsPublishedOnJMXDuringBootstrap() throws Throwable
{
ExecutorService es = Executors.newFixedThreadPool(1);
try (Cluster cluster = builder().withNodes(2)
.withConfig(config -> config.with(GOSSIP)
.with(NETWORK)
.with(JMX)
.set("auto_bootstrap", true))
.withInstanceInitializer(BBBootstrapInterceptor::install)
.createWithoutStarting();
Closeable ignored = es::shutdown)
{
Runnable test = () ->
{
// Wait for bootstrap to start via countdown latch
IInvokableInstance joiningInstance = cluster.get(2);
joiningInstance.runOnInstance(() -> BBBootstrapInterceptor.bootstrapStart.awaitUninterruptibly());
// At this point, it should be possible to check bootstrap status via JMX.
IInstanceConfig config = joiningInstance.config();
try (JMXConnector jmxc = JMXUtil.getJmxConnector(config))
{
MBeanServerConnection mbsc = jmxc.getMBeanServerConnection();
StorageServiceMBean sp = javax.management.JMX.newMBeanProxy(mbsc, new ObjectName("org.apache.cassandra.db:type=StorageService"), StorageServiceMBean.class);
assertEquals(sp.getOperationMode(), StorageService.Mode.JOINING.toString());
}
catch (Throwable t)
{
throw new AssertionError("Should not fail to connect via JMX before bootstrap is completed.", t);
}
finally
{
// Complete bootstrap via countdown latch so test will finish properly
joiningInstance.runOnInstance(() -> BBBootstrapInterceptor.bootstrapReady.decrement());
}
};
Future<?> testResult = es.submit(test);
try
{
cluster.startup();
}
catch (Exception ex) {
// ignore exceptions from startup process. More interested in the test result.
}
testResult.get();
}
es.awaitTermination(5, TimeUnit.SECONDS);
}
public static class BBBootstrapInterceptor
{
final static CountDownLatch bootstrapReady = CountDownLatch.newCountDownLatch(1);
final static CountDownLatch bootstrapStart = CountDownLatch.newCountDownLatch(1);
static void install(ClassLoader cl, int nodeNumber)
{
if (nodeNumber != 2)
return;
new ByteBuddy().rebase(StorageService.class)
.method(named("markViewsAsBuilt"))
.intercept(MethodDelegation.to(BBBootstrapInterceptor.class))
.make()
.load(cl, ClassLoadingStrategy.Default.INJECTION);
}
public static void markViewsAsBuilt(@SuperCall Callable<Void> zuper)
{
bootstrapStart.decrement();
bootstrapReady.awaitUninterruptibly();
}
}
}