From 9a40e8079baff6f499229535a4af75be97f9a3b9 Mon Sep 17 00:00:00 2001 From: Jordan West Date: Thu, 1 Oct 2020 17:44:16 -0700 Subject: [PATCH] upgrade to dtest-api 0.0.6 patch by Jordan West; reviewed by David Capwell for CASSANDRA-16148 --- build.xml | 2 +- .../distributed/impl/DelegatingInvokableInstance.java | 6 ++++++ .../org/apache/cassandra/distributed/impl/Instance.java | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 1e701f89d6..2037f65bd8 100644 --- a/build.xml +++ b/build.xml @@ -396,7 +396,7 @@ - + diff --git a/test/distributed/org/apache/cassandra/distributed/impl/DelegatingInvokableInstance.java b/test/distributed/org/apache/cassandra/distributed/impl/DelegatingInvokableInstance.java index 262da7a66b..9948ce5395 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/DelegatingInvokableInstance.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/DelegatingInvokableInstance.java @@ -95,6 +95,12 @@ public abstract class DelegatingInvokableInstance implements IInvokableInstance delegate().setMessagingVersion(endpoint, version); } + @Override + public String getReleaseVersionString() + { + return delegate().getReleaseVersionString(); + } + public void flush(String keyspace) { delegate().flush(keyspace); diff --git a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java index 0e0723103d..b87c2b8c2e 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java @@ -495,6 +495,11 @@ public class Instance extends IsolatedExecutor implements IInvokableInstance runOnInstance(() -> MessagingService.instance().setVersion(endpoint.getAddress(), version)); } + public String getReleaseVersionString() + { + return callsOnInstance(() -> FBUtilities.getReleaseVersionString()).call(); + } + public void flush(String keyspace) { runOnInstance(() -> FBUtilities.waitOnFutures(Keyspace.open(keyspace).flush()));