You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sm...@apache.org on 2023/08/02 17:08:56 UTC
[cassandra] branch trunk updated (087e92724e -> fe9ad77fd7)
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 087e92724e Merge branch 'cassandra-4.1' into trunk
add b94436c783 update ConfigCompatibility test
new fe9ad77fd7 Merge branch 'cassandra-4.1' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/config/Converters.java | 1 +
test/data/config/version=3.0.0-alpha1.yml | 3 +
test/data/config/version=4.0-alpha1.yml | 3 +
test/data/config/version=4.1-alpha1.yml | 424 +++++++++++++++++++++
...e.java => ConfigCompatibilityTestGenerate.java} | 12 +-
...ilityTest.java => ConfigCompatibilityTest.java} | 19 +-
7 files changed, 452 insertions(+), 12 deletions(-)
create mode 100644 test/data/config/version=4.1-alpha1.yml
rename test/distributed/org/apache/cassandra/distributed/upgrade/{ConfigCompatabilityTestGenerate.java => ConfigCompatibilityTestGenerate.java} (87%)
rename test/unit/org/apache/cassandra/config/{ConfigCompatabilityTest.java => ConfigCompatibilityTest.java} (95%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit fe9ad77fd7842f69a03c7991b96274a7fdb3e90f
Merge: 087e92724e b94436c783
Author: Stefan Miklosovic <sm...@apache.org>
AuthorDate: Wed Aug 2 18:36:36 2023 +0200
Merge branch 'cassandra-4.1' into trunk
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/config/Converters.java | 1 +
test/data/config/version=3.0.0-alpha1.yml | 3 +
test/data/config/version=4.0-alpha1.yml | 3 +
test/data/config/version=4.1-alpha1.yml | 424 +++++++++++++++++++++
...e.java => ConfigCompatibilityTestGenerate.java} | 12 +-
...ilityTest.java => ConfigCompatibilityTest.java} | 19 +-
7 files changed, 452 insertions(+), 12 deletions(-)
diff --cc src/java/org/apache/cassandra/config/Config.java
index 34a173c8c6,8a59ca2cda..831bf93cfc
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -876,16 -837,6 +876,16 @@@ public class Confi
public volatile boolean compact_tables_enabled = true;
public volatile boolean read_before_write_list_operations_enabled = true;
public volatile boolean allow_filtering_enabled = true;
+ public volatile boolean simplestrategy_enabled = true;
+ @Replaces(oldName = "compaction_large_partition_warning_threshold_mb", converter = Converters.LONG_BYTES_DATASTORAGE_MEBIBYTES_INT, deprecated = true)
+ @Replaces(oldName = "compaction_large_partition_warning_threshold", converter = Converters.LONG_BYTES_DATASTORAGE_MEBIBYTES_DATASTORAGE, deprecated = true)
+ public volatile DataStorageSpec.LongBytesBound partition_size_warn_threshold = null;
+ public volatile DataStorageSpec.LongBytesBound partition_size_fail_threshold = null;
- @Replaces(oldName = "compaction_tombstone_warning_threshold", converter = Converters.IDENTITY, deprecated = true)
++ @Replaces(oldName = "compaction_tombstone_warning_threshold", converter = Converters.INTEGER_PRIMITIVE_LONG, deprecated = true)
+ public volatile long partition_tombstones_warn_threshold = -1;
+ public volatile long partition_tombstones_fail_threshold = -1;
+ public volatile DataStorageSpec.LongBytesBound column_value_size_warn_threshold = null;
+ public volatile DataStorageSpec.LongBytesBound column_value_size_fail_threshold = null;
public volatile DataStorageSpec.LongBytesBound collection_size_warn_threshold = null;
public volatile DataStorageSpec.LongBytesBound collection_size_fail_threshold = null;
public volatile int items_per_collection_warn_threshold = -1;
diff --cc src/java/org/apache/cassandra/config/Converters.java
index 74ff7a2476,c898c08d64..c3983652e6
--- a/src/java/org/apache/cassandra/config/Converters.java
+++ b/src/java/org/apache/cassandra/config/Converters.java
@@@ -42,6 -40,6 +42,7 @@@ public enum Converter
* able to still use the old name too. No units involved.
*/
IDENTITY(null, null, o -> o, o -> o),
++ INTEGER_PRIMITIVE_LONG(Integer.class, long.class, Integer::longValue, Long::intValue),
MILLIS_DURATION_LONG(Long.class, DurationSpec.LongMillisecondsBound.class,
DurationSpec.LongMillisecondsBound::new,
o -> o == null ? null : o.toMilliseconds()),
diff --cc test/data/config/version=4.1-alpha1.yml
index 0000000000,0000000000..1b53159afc
new file mode 100644
--- /dev/null
+++ b/test/data/config/version=4.1-alpha1.yml
@@@ -1,0 -1,0 +1,424 @@@
++---
++columns_per_table_warn_threshold: "java.lang.Integer"
++repaired_data_tracking_for_range_reads_enabled: "java.lang.Boolean"
++cdc_block_writes: "java.lang.Boolean"
++block_for_peers_timeout_in_secs: "java.lang.Integer"
++flush_compression: "org.apache.cassandra.config.Config.FlushCompression"
++commitlog_total_space: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++audit_logging_options:
++ audit_logs_dir: "java.lang.String"
++ included_users: "java.lang.String"
++ logger:
++ class_name: "java.lang.String"
++ parameters: "java.util.Map"
++ excluded_categories: "java.lang.String"
++ roll_cycle: "java.lang.String"
++ enabled: "java.lang.Boolean"
++ included_categories: "java.lang.String"
++ max_archive_retries: "java.lang.Integer"
++ excluded_keyspaces: "java.lang.String"
++ archive_command: "java.lang.String"
++ included_keyspaces: "java.lang.String"
++ max_log_size: "java.lang.Long"
++ allow_nodetool_archive_command: "java.lang.Boolean"
++ block: "java.lang.Boolean"
++ excluded_users: "java.lang.String"
++ max_queue_weight: "java.lang.Integer"
++row_cache_save_period: "org.apache.cassandra.config.DurationSpec.IntSecondsBound"
++snapshot_links_per_second: "java.lang.Long"
++disk_optimization_estimate_percentile: "java.lang.Double"
++roles_update_interval: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++hinted_handoff_disabled_datacenters: "java.util.Set"
++cdc_enabled: "java.lang.Boolean"
++compaction_tombstone_warning_threshold: "java.lang.Integer"
++internode_application_receive_queue_reserve_endpoint_capacity: "org.apache.cassandra.config.DataStorageSpec.IntBytesBound"
++roles_validity: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++coordinator_read_size_warn_threshold: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++scripted_user_defined_functions_enabled: "java.lang.Boolean"
++auth_cache_warming_enabled: "java.lang.Boolean"
++entire_sstable_stream_throughput_outbound: "org.apache.cassandra.config.DataRateSpec.LongBytesPerSecondBound"
++roles_cache_active_update: "java.lang.Boolean"
++commitlog_sync: "org.apache.cassandra.config.Config.CommitLogSync"
++paxos_repair_parallelism: "java.lang.Integer"
++dynamic_snitch_reset_interval: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++dynamic_snitch_update_interval: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++native_transport_idle_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++internode_application_send_queue_reserve_global_capacity: "org.apache.cassandra.config.DataStorageSpec.IntBytesBound"
++concurrent_materialized_view_writes: "java.lang.Integer"
++read_before_write_list_operations_enabled: "java.lang.Boolean"
++table_properties_ignored: "java.util.Set"
++hints_directory: "java.lang.String"
++native_transport_max_concurrent_connections_per_ip: "java.lang.Long"
++secondary_indexes_per_table_fail_threshold: "java.lang.Integer"
++auto_snapshot_ttl: "java.lang.String"
++rpc_interface_prefer_ipv6: "java.lang.Boolean"
++check_for_duplicate_rows_during_compaction: "java.lang.Boolean"
++gc_log_threshold: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++secondary_indexes_enabled: "java.lang.Boolean"
++user_function_timeout_policy: "org.apache.cassandra.config.Config.UserFunctionTimeoutPolicy"
++memtable_allocation_type: "org.apache.cassandra.config.Config.MemtableAllocationType"
++hints_flush_period: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++default_keyspace_rf: "java.lang.Integer"
++tombstone_warn_threshold: "java.lang.Integer"
++write_consistency_levels_warned: "java.util.Set"
++full_query_logging_options:
++ log_dir: "java.lang.String"
++ archive_command: "java.lang.String"
++ max_log_size: "java.lang.Long"
++ allow_nodetool_archive_command: "java.lang.Boolean"
++ block: "java.lang.Boolean"
++ roll_cycle: "java.lang.String"
++ max_queue_weight: "java.lang.Integer"
++ max_archive_retries: "java.lang.Integer"
++streaming_keep_alive_period: "org.apache.cassandra.config.DurationSpec.IntSecondsBound"
++table_count_warn_threshold: "java.lang.Integer"
++auto_optimise_inc_repair_streams: "java.lang.Boolean"
++user_defined_functions_fail_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++write_request_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++commitlog_sync_batch_window_in_ms: "java.lang.Double"
++min_tracked_partition_tombstone_count: "java.lang.Long"
++sasi_indexes_enabled: "java.lang.Boolean"
++disk_failure_policy: "org.apache.cassandra.config.Config.DiskFailurePolicy"
++tombstone_failure_threshold: "java.lang.Integer"
++native_transport_max_request_data_in_flight: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++initial_token: "java.lang.String"
++keyspaces_warn_threshold: "java.lang.Integer"
++dynamic_snitch_badness_threshold: "java.lang.Double"
++transient_replication_enabled: "java.lang.Boolean"
++allocate_tokens_for_local_replication_factor: "java.lang.Integer"
++native_transport_max_requests_per_second: "java.lang.Integer"
++counter_cache_keys_to_save: "java.lang.Integer"
++disk_optimization_page_cross_chance: "java.lang.Double"
++in_select_cartesian_product_fail_threshold: "java.lang.Integer"
++listen_on_broadcast_address: "java.lang.Boolean"
++row_cache_class_name: "java.lang.String"
++permissions_update_interval: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++denylist_initial_load_retry: "org.apache.cassandra.config.DurationSpec.IntSecondsBound"
++trace_type_query_ttl: "org.apache.cassandra.config.DurationSpec.IntSecondsBound"
++disk_optimization_strategy: "org.apache.cassandra.config.Config.DiskOptimizationStrategy"
++otc_backlog_expiration_interval_ms: "java.lang.Integer"
++native_transport_max_request_data_in_flight_per_ip: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++counter_cache_save_period: "org.apache.cassandra.config.DurationSpec.IntSecondsBound"
++tables_fail_threshold: "java.lang.Integer"
++trace_type_repair_ttl: "org.apache.cassandra.config.DurationSpec.IntSecondsBound"
++keyspace_count_warn_threshold: "java.lang.Integer"
++minimum_replication_factor_warn_threshold: "java.lang.Integer"
++page_size_warn_threshold: "java.lang.Integer"
++role_manager: "java.lang.String"
++counter_write_request_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++denylist_writes_enabled: "java.lang.Boolean"
++block_for_peers_in_remote_dcs: "java.lang.Boolean"
++inter_dc_stream_throughput_outbound: "org.apache.cassandra.config.DataRateSpec.LongBytesPerSecondBound"
++repair_command_pool_size: "java.lang.Integer"
++denylist_consistency_level: "org.apache.cassandra.db.ConsistencyLevel"
++table_properties_warned: "java.util.Set"
++entire_sstable_inter_dc_stream_throughput_outbound: "org.apache.cassandra.config.DataRateSpec.LongBytesPerSecondBound"
++data_file_directories: "java.util.List"
++networking_cache_size: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++fields_per_udt_fail_threshold: "java.lang.Integer"
++key_cache_size: "org.apache.cassandra.config.DataStorageSpec.LongMebibytesBound"
++max_hint_window: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++max_hints_size_per_host: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++client_error_reporting_exclusions:
++ subnets: "java.util.Set"
++seed_provider:
++ class_name: "java.lang.String"
++ parameters: "java.util.Map"
++check_for_duplicate_rows_during_reads: "java.lang.Boolean"
++internode_max_message_size: "org.apache.cassandra.config.DataStorageSpec.IntBytesBound"
++items_per_collection_warn_threshold: "java.lang.Integer"
++key_cache_migrate_during_compaction: "java.lang.Boolean"
++network_authorizer: "java.lang.String"
++data_disk_usage_max_disk_size: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++memtable_offheap_space: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++prepared_statements_cache_size: "org.apache.cassandra.config.DataStorageSpec.LongMebibytesBound"
++paxos_contention_wait_randomizer: "java.lang.String"
++commitlog_compression:
++ class_name: "java.lang.String"
++ parameters: "java.util.Map"
++broadcast_address: "java.lang.String"
++repair_session_space: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++partition_denylist_enabled: "java.lang.Boolean"
++paxos_cache_size: "org.apache.cassandra.config.DataStorageSpec.LongMebibytesBound"
++snapshot_before_compaction: "java.lang.Boolean"
++back_pressure_strategy:
++ class_name: "java.lang.String"
++ parameters: "java.util.Map"
++native_transport_port_ssl: "java.lang.Integer"
++allocate_tokens_for_keyspace: "java.lang.String"
++uuid_sstable_identifiers_enabled: "java.lang.Boolean"
++credentials_cache_active_update: "java.lang.Boolean"
++diagnostic_events_enabled: "java.lang.Boolean"
++failure_detector: "java.lang.String"
++storage_port: "java.lang.Integer"
++drop_compact_storage_enabled: "java.lang.Boolean"
++uncompressed_tables_enabled: "java.lang.Boolean"
++commitlog_sync_group_window: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++auth_read_consistency_level: "java.lang.String"
++autocompaction_on_startup_enabled: "java.lang.Boolean"
++items_per_collection_fail_threshold: "java.lang.Integer"
++paxos_state_purging: "org.apache.cassandra.config.Config.PaxosStatePurging"
++column_index_cache_size: "org.apache.cassandra.config.DataStorageSpec.IntKibibytesBound"
++commit_failure_policy: "org.apache.cassandra.config.Config.CommitFailurePolicy"
++concurrent_writes: "java.lang.Integer"
++max_value_size: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++compaction_large_partition_warning_threshold: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++read_request_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++hinted_handoff_enabled: "java.lang.Boolean"
++automatic_sstable_upgrade: "java.lang.Boolean"
++memtable_flush_writers: "java.lang.Integer"
++otc_coalescing_strategy: "java.lang.String"
++snapshot_on_repaired_data_mismatch: "java.lang.Boolean"
++commitlog_max_compression_buffers_in_pool: "java.lang.Integer"
++cdc_free_space_check_interval: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++roles_cache_max_entries: "java.lang.Integer"
++allow_filtering_enabled: "java.lang.Boolean"
++native_transport_max_negotiable_protocol_version: "java.lang.Integer"
++columns_per_table_fail_threshold: "java.lang.Integer"
++start_native_transport: "java.lang.Boolean"
++ssl_storage_port: "java.lang.Integer"
++cluster_name: "java.lang.String"
++credentials_update_interval: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++incremental_backups: "java.lang.Boolean"
++internode_socket_send_buffer_size: "org.apache.cassandra.config.DataStorageSpec.IntBytesBound"
++min_tracked_partition_size: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++cas_contention_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++key_cache_save_period: "org.apache.cassandra.config.DurationSpec.IntSecondsBound"
++windows_timer_interval: "java.lang.Integer"
++rpc_interface: "java.lang.String"
++row_cache_keys_to_save: "java.lang.Integer"
++compact_tables_enabled: "java.lang.Boolean"
++repair_command_pool_full_strategy: "org.apache.cassandra.config.Config.RepairCommandPoolFullStrategy"
++drop_truncate_table_enabled: "java.lang.Boolean"
++max_top_size_partition_count: "java.lang.Integer"
++client_encryption_options:
++ optional: "java.lang.Boolean"
++ store_type: "java.lang.String"
++ cipher_suites: "java.util.List"
++ enabled: "java.lang.Boolean"
++ require_endpoint_verification: "java.lang.Boolean"
++ accepted_protocols: "java.util.List"
++ keystore_password: "java.lang.String"
++ protocol: "java.lang.String"
++ require_client_auth: "java.lang.Boolean"
++ ssl_context_factory:
++ class_name: "java.lang.String"
++ parameters: "java.util.Map"
++ truststore_password: "java.lang.String"
++ keystore: "java.lang.String"
++ truststore: "java.lang.String"
++ algorithm: "java.lang.String"
++concurrent_validations: "java.lang.Integer"
++ideal_consistency_level: "org.apache.cassandra.db.ConsistencyLevel"
++partition_keys_in_select_warn_threshold: "java.lang.Integer"
++consecutive_message_errors_threshold: "java.lang.Integer"
++read_thresholds_enabled: "java.lang.Boolean"
++internode_application_send_queue_reserve_endpoint_capacity: "org.apache.cassandra.config.DataStorageSpec.IntBytesBound"
++partition_keys_in_select_fail_threshold: "java.lang.Integer"
++trickle_fsync: "java.lang.Boolean"
++group_by_enabled: "java.lang.Boolean"
++reject_repair_compaction_threshold: "java.lang.Integer"
++request_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++cdc_total_space: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++paxos_variant: "org.apache.cassandra.config.Config.PaxosVariant"
++index_summary_resize_interval: "org.apache.cassandra.config.DurationSpec.IntMinutesBound"
++max_top_tombstone_partition_count: "java.lang.Integer"
++data_disk_usage_percentage_fail_threshold: "java.lang.Integer"
++max_streaming_retries: "java.lang.Integer"
++internode_timeout: "java.lang.Boolean"
++native_transport_flush_in_batches_legacy: "java.lang.Boolean"
++rpc_address: "java.lang.String"
++trickle_fsync_interval: "org.apache.cassandra.config.DataStorageSpec.IntKibibytesBound"
++file_cache_enabled: "java.lang.Boolean"
++cdc_raw_directory: "java.lang.String"
++num_tokens: "java.lang.Integer"
++native_transport_max_frame_size: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++user_timestamps_enabled: "java.lang.Boolean"
++paxos_topology_repair_no_dc_checks: "java.lang.Boolean"
++repaired_data_tracking_for_partition_reads_enabled: "java.lang.Boolean"
++internode_streaming_tcp_user_timeout: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++file_cache_size: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++denylist_max_keys_per_table: "java.lang.Integer"
++commitlog_directory: "java.lang.String"
++unlogged_batch_across_partitions_warn_threshold: "java.lang.Integer"
++write_consistency_levels_disallowed: "java.util.Set"
++auto_bootstrap: "java.lang.Boolean"
++authorizer: "java.lang.String"
++auth_write_consistency_level: "java.lang.String"
++counter_cache_size: "org.apache.cassandra.config.DataStorageSpec.LongMebibytesBound"
++denylist_range_reads_enabled: "java.lang.Boolean"
++batchlog_replay_throttle: "org.apache.cassandra.config.DataStorageSpec.IntKibibytesBound"
++compaction_throughput: "org.apache.cassandra.config.DataRateSpec.LongBytesPerSecondBound"
++stream_throughput_outbound: "org.apache.cassandra.config.DataRateSpec.LongBytesPerSecondBound"
++streaming_state_expires: "org.apache.cassandra.config.DurationSpec.LongNanosecondsBound"
++broadcast_rpc_address: "java.lang.String"
++listen_interface_prefer_ipv6: "java.lang.Boolean"
++repair_session_max_tree_depth: "java.lang.Integer"
++auto_optimise_preview_repair_streams: "java.lang.Boolean"
++internode_tcp_connect_timeout: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++paxos_purge_grace_period: "org.apache.cassandra.config.DurationSpec.LongSecondsBound"
++commitlog_sync_period: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++concurrent_compactors: "java.lang.Integer"
++hint_window_persistent_enabled: "java.lang.Boolean"
++buffer_pool_use_heap_if_exhausted: "java.lang.Boolean"
++paxos_contention_max_wait: "java.lang.String"
++native_transport_receive_queue_capacity: "org.apache.cassandra.config.DataStorageSpec.IntBytesBound"
++in_select_cartesian_product_warn_threshold: "java.lang.Integer"
++local_system_data_file_directory: "java.lang.String"
++stream_entire_sstables: "java.lang.Boolean"
++internode_tcp_user_timeout: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++corrupted_tombstone_strategy: "org.apache.cassandra.config.Config.CorruptedTombstoneStrategy"
++paxos_topology_repair_strict_each_quorum: "java.lang.Boolean"
++listen_address: "java.lang.String"
++top_partitions_enabled: "java.lang.Boolean"
++sstable_preemptive_open_interval: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++rpc_keepalive: "java.lang.Boolean"
++min_free_space_per_drive: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++read_consistency_levels_warned: "java.util.Set"
++allow_extra_insecure_udfs: "java.lang.Boolean"
++batch_size_fail_threshold: "org.apache.cassandra.config.DataStorageSpec.IntKibibytesBound"
++disk_access_mode: "org.apache.cassandra.config.Config.DiskAccessMode"
++concurrent_counter_writes: "java.lang.Integer"
++internode_error_reporting_exclusions:
++ subnets: "java.util.Set"
++paxos_contention_min_delta: "java.lang.String"
++dynamic_snitch: "java.lang.Boolean"
++use_deterministic_table_id: "java.lang.Boolean"
++phi_convict_threshold: "java.lang.Double"
++max_hints_file_size: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++native_transport_max_threads: "java.lang.Integer"
++minimum_replication_factor_fail_threshold: "java.lang.Integer"
++table_properties_disallowed: "java.util.Set"
++collection_size_warn_threshold: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++memtable:
++ configurations: "java.util.LinkedHashMap"
++authenticator: "java.lang.String"
++internode_socket_receive_buffer_size: "org.apache.cassandra.config.DataStorageSpec.IntBytesBound"
++allow_insecure_udfs: "java.lang.Boolean"
++internode_application_receive_queue_capacity: "org.apache.cassandra.config.DataStorageSpec.IntBytesBound"
++concurrent_replicates: "java.lang.Integer"
++user_defined_functions_enabled: "java.lang.Boolean"
++user_defined_functions_threads_enabled: "java.lang.Boolean"
++streaming_slow_events_log_timeout: "org.apache.cassandra.config.DurationSpec.IntSecondsBound"
++truncate_request_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++periodic_commitlog_sync_lag_block: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++repair_request_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++auto_optimise_full_repair_streams: "java.lang.Boolean"
++commitlog_segment_size: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++batch_size_warn_threshold: "org.apache.cassandra.config.DataStorageSpec.IntKibibytesBound"
++streaming_state_size: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++denylist_max_keys_total: "java.lang.Integer"
++repair_state_expires: "org.apache.cassandra.config.DurationSpec.LongNanosecondsBound"
++native_transport_allow_older_protocols: "java.lang.Boolean"
++otc_coalescing_enough_coalesced_messages: "java.lang.Integer"
++report_unconfirmed_repaired_data_mismatches: "java.lang.Boolean"
++fields_per_udt_warn_threshold: "java.lang.Integer"
++paxos_on_linearizability_violations: "org.apache.cassandra.config.Config.PaxosOnLinearizabilityViolation"
++read_consistency_levels_disallowed: "java.util.Set"
++use_offheap_merkle_trees: "java.lang.Boolean"
++concurrent_materialized_view_builders: "java.lang.Integer"
++server_encryption_options:
++ optional: "java.lang.Boolean"
++ store_type: "java.lang.String"
++ cipher_suites: "java.util.List"
++ enabled: "java.lang.Boolean"
++ require_endpoint_verification: "java.lang.Boolean"
++ accepted_protocols: "java.util.List"
++ keystore_password: "java.lang.String"
++ protocol: "java.lang.String"
++ require_client_auth: "java.lang.Boolean"
++ internode_encryption: "org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions.InternodeEncryption"
++ ssl_context_factory:
++ class_name: "java.lang.String"
++ parameters: "java.util.Map"
++ legacy_ssl_storage_port_enabled: "java.lang.Boolean"
++ truststore_password: "java.lang.String"
++ keystore: "java.lang.String"
++ truststore: "java.lang.String"
++ algorithm: "java.lang.String"
++traverse_auth_from_root: "java.lang.Boolean"
++denylist_refresh: "org.apache.cassandra.config.DurationSpec.IntSecondsBound"
++max_hints_delivery_threads: "java.lang.Integer"
++permissions_validity: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++materialized_views_enabled: "java.lang.Boolean"
++saved_caches_directory: "java.lang.String"
++internode_application_send_queue_capacity: "org.apache.cassandra.config.DataStorageSpec.IntBytesBound"
++memtable_heap_space: "org.apache.cassandra.config.DataStorageSpec.IntMebibytesBound"
++max_concurrent_automatic_sstable_upgrades: "java.lang.Integer"
++denylist_reads_enabled: "java.lang.Boolean"
++permissions_cache_active_update: "java.lang.Boolean"
++available_processors: "java.lang.Integer"
++file_cache_round_up: "java.lang.Boolean"
++secondary_indexes_per_table_warn_threshold: "java.lang.Integer"
++tables_warn_threshold: "java.lang.Integer"
++snapshot_on_duplicate_row_detection: "java.lang.Boolean"
++internode_application_receive_queue_reserve_global_capacity: "org.apache.cassandra.config.DataStorageSpec.IntBytesBound"
++internode_compression: "org.apache.cassandra.config.Config.InternodeCompression"
++range_request_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++streaming_stats_enabled: "java.lang.Boolean"
++local_read_size_fail_threshold: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++otc_coalescing_window_us: "java.lang.Integer"
++page_size_fail_threshold: "java.lang.Integer"
++credentials_cache_max_entries: "java.lang.Integer"
++coordinator_read_size_fail_threshold: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++row_index_read_size_fail_threshold: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++index_summary_capacity: "org.apache.cassandra.config.DataStorageSpec.LongMebibytesBound"
++collection_size_fail_threshold: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++column_index_size: "org.apache.cassandra.config.DataStorageSpec.IntKibibytesBound"
++validation_preview_purge_head_start: "org.apache.cassandra.config.DurationSpec.IntSecondsBound"
++skip_paxos_repair_on_topology_change_keyspaces: "java.util.Set"
++materialized_views_per_table_fail_threshold: "java.lang.Integer"
++max_mutation_size: "org.apache.cassandra.config.DataStorageSpec.IntKibibytesBound"
++keyspaces_fail_threshold: "java.lang.Integer"
++data_disk_usage_percentage_warn_threshold: "java.lang.Integer"
++slow_query_log_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++paxos_contention_min_wait: "java.lang.String"
++repair_state_size: "java.lang.Integer"
++user_defined_functions_warn_timeout: "org.apache.cassandra.config.DurationSpec.LongMillisecondsBound"
++native_transport_port: "java.lang.Integer"
++permissions_cache_max_entries: "java.lang.Integer"
++hinted_handoff_throttle: "org.apache.cassandra.config.DataStorageSpec.IntKibibytesBound"
++row_index_read_size_warn_threshold: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++hints_compression:
++ class_name: "java.lang.String"
++ parameters: "java.util.Map"
++commitlog_periodic_queue_size: "java.lang.Integer"
++force_new_prepared_statement_behaviour: "java.lang.Boolean"
++back_pressure_enabled: "java.lang.Boolean"
++materialized_views_per_table_warn_threshold: "java.lang.Integer"
++transparent_data_encryption_options:
++ cipher: "java.lang.String"
++ chunk_length_kb: "java.lang.Integer"
++ iv_length: "java.lang.Integer"
++ key_alias: "java.lang.String"
++ key_provider:
++ class_name: "java.lang.String"
++ parameters: "java.util.Map"
++ enabled: "java.lang.Boolean"
++initial_range_tombstone_list_allocation_size: "java.lang.Integer"
++partitioner: "java.lang.String"
++gc_warn_threshold: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++listen_interface: "java.lang.String"
++row_cache_size: "org.apache.cassandra.config.DataStorageSpec.LongMebibytesBound"
++paxos_repair_enabled: "java.lang.Boolean"
++inter_dc_tcp_nodelay: "java.lang.Boolean"
++internode_authenticator: "java.lang.String"
++key_cache_keys_to_save: "java.lang.Integer"
++local_read_size_warn_threshold: "org.apache.cassandra.config.DataStorageSpec.LongBytesBound"
++replica_filtering_protection:
++ cached_rows_fail_threshold: "java.lang.Integer"
++ cached_rows_warn_threshold: "java.lang.Integer"
++range_tombstone_list_growth_factor: "java.lang.Double"
++startup_checks: "java.util.Map"
++native_transport_max_concurrent_connections: "java.lang.Long"
++memtable_cleanup_threshold: "java.lang.Float"
++concurrent_reads: "java.lang.Integer"
++credentials_validity: "org.apache.cassandra.config.DurationSpec.IntMillisecondsBound"
++streaming_connections_per_host: "java.lang.Integer"
++cache_load_timeout: "org.apache.cassandra.config.DurationSpec.IntSecondsBound"
++native_transport_rate_limiting_enabled: "java.lang.Boolean"
++use_statements_enabled: "java.lang.Boolean"
++auto_hints_cleanup_enabled: "java.lang.Boolean"
++auto_snapshot: "java.lang.Boolean"
++skip_paxos_repair_on_topology_change: "java.lang.Boolean"
++endpoint_snitch: "java.lang.String"
diff --cc test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatibilityTestGenerate.java
index 518fd14564,737ad07022..bba365686c
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatibilityTestGenerate.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatibilityTestGenerate.java
@@@ -43,7 -43,7 +43,7 @@@ public class ConfigCompatibilityTestGen
{
ICluster.setup();
Versions versions = Versions.find();
-- for (Semver version : Arrays.asList(UpgradeTestBase.v30, UpgradeTestBase.v3X, UpgradeTestBase.v40))
++ for (Semver version : Arrays.asList(UpgradeTestBase.v30, UpgradeTestBase.v3X, UpgradeTestBase.v40, UpgradeTestBase.v41))
{
File path = new File(TEST_DIR, "version=" + version + ".yml");
path.getParentFile().mkdirs();
diff --cc test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java
index 6db68ec6b7,3b8a5a1601..be6917b488
--- a/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java
+++ b/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java
@@@ -118,11 -111,11 +119,19 @@@ public class ConfigCompatibilityTes
public void diff_4_0() throws IOException
{
diff(TEST_DIR + "/version=4.0-alpha1.yml", ImmutableSet.<String>builder()
-- .addAll(WINDOWS)
- .build(), EXPECTED_FOR_50);
- .build());
++ .addAll(WINDOWS)
++ .build(), EXPECTED_FOR_50);
++ }
++
++ @Test
++ public void diff_4_1() throws IOException
++ {
++ diff(TEST_DIR + "/version=4.1-alpha1.yml", ImmutableSet.<String>builder()
++ .addAll(WINDOWS)
++ .build(), EXPECTED_FOR_50);
}
- private void diff(String original, Set<String> ignore) throws IOException
+ private void diff(String original, Set<String> ignore, Set<String> expectedErrors) throws IOException
{
Class<Config> type = Config.class;
ClassTree previous = load(original);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org