This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a commit to branch cep-15-accord
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2c79de82a529df43ebff0932c6739143a26bade8
Author: Caleb Rackliffe <calebrackli...@gmail.com>
AuthorDate: Tue Oct 3 11:42:53 2023 -0500
Fix AccordJournalTest and ConfigCompatibilityTest, and revert the
sendMessageWithFailureCB() callback to printing just the repair failure reason
in its error message
---
src/java/org/apache/cassandra/repair/messages/RepairMessage.java | 4 ++--
src/java/org/apache/cassandra/utils/FBUtilities.java | 3 ---
test/data/config/version=5.0-alpha1.yml | 2 +-
.../org/apache/cassandra/config/ConfigCompatibilityTest.java | 1 +
.../org/apache/cassandra/service/accord/AccordJournalTest.java | 9 +++++++++
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/java/org/apache/cassandra/repair/messages/RepairMessage.java
b/src/java/org/apache/cassandra/repair/messages/RepairMessage.java
index d3007aafab..b616d033df 100644
--- a/src/java/org/apache/cassandra/repair/messages/RepairMessage.java
+++ b/src/java/org/apache/cassandra/repair/messages/RepairMessage.java
@@ -195,9 +195,9 @@ public abstract class RepairMessage
}
@Override
- public void onFailure(InetAddressAndPort from, RequestFailure
failureReason)
+ public void onFailure(InetAddressAndPort from, RequestFailure
failure)
{
- failureCallback.onFailure(RepairException.error(request.desc,
PreviewKind.NONE, String.format("Got %s failure from %s: %s", verb, from,
failureReason)));
+ failureCallback.onFailure(RepairException.error(request.desc,
PreviewKind.NONE, String.format("Got %s failure from %s: %s", verb, from,
failure.reason)));
}
@Override
diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java
b/src/java/org/apache/cassandra/utils/FBUtilities.java
index 8ef8f9ea6c..7241b5acab 100644
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@ -95,7 +95,6 @@ import org.apache.cassandra.utils.concurrent.FutureCombiner;
import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
import org.objectweb.asm.Opcodes;
-import static
org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_AVAILABLE_PROCESSORS;
import static org.apache.cassandra.config.CassandraRelevantProperties.GIT_SHA;
import static
org.apache.cassandra.config.CassandraRelevantProperties.LINE_SEPARATOR;
import static org.apache.cassandra.config.CassandraRelevantProperties.OS_NAME;
@@ -131,8 +130,6 @@ public class FBUtilities
private static volatile String previousReleaseVersionString;
- private static final int availableProcessors =
CASSANDRA_AVAILABLE_PROCESSORS.getInt(DatabaseDescriptor.getAvailableProcessors());
-
public static void setAvailableProcessors(int value)
{
DatabaseDescriptor.setAvailableProcessors(value);
diff --git a/test/data/config/version=5.0-alpha1.yml
b/test/data/config/version=5.0-alpha1.yml
index 21630a19d2..6e426332bb 100644
--- a/test/data/config/version=5.0-alpha1.yml
+++ b/test/data/config/version=5.0-alpha1.yml
@@ -403,7 +403,7 @@ max_concurrent_automatic_sstable_upgrades:
"java.lang.Integer"
maximum_replication_factor_warn_threshold: "java.lang.Integer"
denylist_reads_enabled: "java.lang.Boolean"
permissions_cache_active_update: "java.lang.Boolean"
-available_processors: "java.lang.Integer"
+available_processors: "org.apache.cassandra.config.OptionaldPositiveInt"
file_cache_round_up: "java.lang.Boolean"
secondary_indexes_per_table_warn_threshold: "java.lang.Integer"
tables_warn_threshold: "java.lang.Integer"
diff --git a/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java
b/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java
index 51e0b0ceda..475a8db2e8 100644
--- a/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java
+++ b/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java
@@ -101,6 +101,7 @@ public class ConfigCompatibilityTest
.add("authenticator types do not match;
org.apache.cassandra.config.ParameterizedClass != java.lang.String")
.add("Property internode_authenticator used to be a value-type, but now is
nested type class org.apache.cassandra.config.ParameterizedClass")
.add("Property authenticator used to be a value-type, but now is nested type
class org.apache.cassandra.config.ParameterizedClass")
+
.add("available_processors types do not match;
org.apache.cassandra.config.OptionaldPositiveInt != java.lang.Integer")
.build();
/**
diff --git
a/test/unit/org/apache/cassandra/service/accord/AccordJournalTest.java
b/test/unit/org/apache/cassandra/service/accord/AccordJournalTest.java
index 7059a12f2a..d607733f27 100644
--- a/test/unit/org/apache/cassandra/service/accord/AccordJournalTest.java
+++ b/test/unit/org/apache/cassandra/service/accord/AccordJournalTest.java
@@ -23,18 +23,21 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
+import org.junit.BeforeClass;
import org.junit.Test;
import accord.primitives.TxnId;
import accord.utils.AccordGens;
import accord.utils.Gen;
import accord.utils.Gens;
+import org.apache.cassandra.config.CassandraRelevantProperties;
import org.apache.cassandra.io.util.DataInputBuffer;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.service.accord.AccordJournal.Key;
import org.apache.cassandra.utils.AsymmetricOrdering;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.FBUtilities.Order;
+import org.apache.cassandra.utils.StorageCompatibilityMode;
import org.checkerframework.checker.nullness.qual.Nullable;
import static accord.utils.Property.qt;
@@ -42,6 +45,12 @@ import static org.assertj.core.api.Assertions.assertThat;
public class AccordJournalTest
{
+ @BeforeClass
+ public static void setCompatibilityMode()
+ {
+
CassandraRelevantProperties.JUNIT_STORAGE_COMPATIBILITY_MODE.setEnum(StorageCompatibilityMode.NONE);
+ }
+
@Test
public void keySerde()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
