This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 65653af2ce6a659acce149edc5eb1e1264ad3615 Merge: 9bc8d0b 67b8504 Author: Mick Semb Wever <[email protected]> AuthorDate: Tue Mar 9 22:35:22 2021 +0100 Merge branch 'cassandra-3.11' into trunk CHANGES.txt | 1 + redhat/cassandra.spec | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index 2c834d2,cb66874..5aa2757 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -40,46 -4,22 +40,47 @@@ Merged from 3.0 * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades (CASSANDRA-16415) * Update debian packaging for python3 (CASSANDRA-16396) * Avoid pushing schema mutations when setting up distributed system keyspaces locally (CASSANDRA-16387) + * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261) + * Improve empty hint file handling during startup (CASSANDRA-16162) + * Fix skipping on pre-3.0 created compact storage sstables due to missing primary key liveness (CASSANDRA-16226) + * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372) Merged from 2.2: + * Fix centos packaging for arm64, >=3.0 rpm's now require python3 (CASSANDRA-16477) * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286) -3.11.10 - * Fix digest computation for queries with fetched but non queried columns (CASSANDRA-15962) - * Reduce amount of allocations during batch statement execution (CASSANDRA-16201) - * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393) - * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925) - * Rate limit validation compactions using compaction_throughput_mb_per_sec (CASSANDRA-16161) +4.0-beta4 + * DROP COMPACT STORAGE should invalidate prepared statements still using CompactTableMetadata (CASSANDRA-16361) + * Update default num_tokens to 16 and allocate_tokens_for_local_replication_factor to 3 (CASSANDRA-13701) + * Remove use of String.intern() (CASSANDRA-15810) + * Fix the missing bb position in ByteBufferAccessor.getUnsignedShort (CASSANDRA-16249) + * Make sure OOM errors are rethrown on truncation failure (CASSANDRA-16254) + * Send back client warnings when creating too many tables/keyspaces (CASSANDRA-16309) + * Add dedicated tcp user timeout for streaming connection (CASSANDRA-16143) + * Add generatetokens script for offline token allocation strategy generation (CASSANDRA-16205) + * Remove Windows scripts (CASSANDRA-16171) + * Improve checksumming and compression in protocol V5 (CASSANDRA-15299) + * Optimised repair streaming improvements (CASSANDRA-16274) + * Update jctools dependency to 3.1.0 (CASSANDRA-16255) + * 'SSLEngine closed already' exception on failed outbound connection (CASSANDRA-16277) + * Drain and/or shutdown might throw because of slow messaging service shutdown (CASSANDRA-16276) + * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems (CASSANDRA-16212) + * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246) + * Ensure that CacheMetrics.requests is picked up by the metric reporter (CASSANDRA-16228) + * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019) + * Produce consistent tombstone for reads to avoid digest mistmatch (CASSANDRA-15369) + * Fix SSTableloader issue when restoring a table named backups (CASSANDRA-16235) + * Invalid serialized size for responses caused by increasing message time by 1ms which caused extra bytes in size calculation (CASSANDRA-16103) + * Throw BufferOverflowException from DataOutputBuffer for better visibility (CASSANDRA-16214) + * TLS connections to the storage port on a node without server encryption configured causes java.io.IOException accessing missing keystore (CASSANDRA-16144) + * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214) + * When a table attempts to clean up metrics, it was cleaning up all global table metrics (CASSANDRA-16095) + * Bring back the accepted encryption protocols list as configurable option (CASSANDRA-13325) + * DigestResolver.getData throws AssertionError since dataResponse is null (CASSANDRA-16097) + * Cannot replace_address /X because it doesn't exist in gossip (CASSANDRA-16213) + * cqlsh row_id resets on page boundaries (CASSANDRA-16160) +Merged from 3.11: * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to default of 1GB (CASSANDRA-16071) Merged from 3.0: - * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261) - * Improve empty hint file handling during startup (CASSANDRA-16162) - * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372) - * Fix skipping on pre-3.0 created compact storage sstables due to missing primary key liveness (CASSANDRA-16226) * Extend the exclusion of replica filtering protection to other indices instead of just SASI (CASSANDRA-16311) * Synchronize transaction logs for JBOD (CASSANDRA-16225) * Fix the counting of cells per partition (CASSANDRA-16259) diff --cc redhat/cassandra.spec index dcbda87,19cbdf5..a854767 --- a/redhat/cassandra.spec +++ b/redhat/cassandra.spec @@@ -6,11 -6,12 +6,13 @@@ # binary executable files in our 'noarch' package %define _binaries_in_noarch_packages_terminate_build 0 -# for python 2/3 support we rely on /usr/bin/python -%define __python /usr/bin/python ++%define __python /usr/bin/python3 + %global username cassandra -%define relname apache-cassandra-%{version} +# input of ~alphaN, ~betaN, ~rcN package versions need to retain upstream '-alphaN, etc' version for sources +%define upstream_version %(echo %{version} | sed -r 's/~/-/g') +%define relname apache-cassandra-%{upstream_version} Name: cassandra Version: %{version} @@@ -27,7 -28,7 +29,7 @@@ BuildRequires: ant >= 1. BuildRequires: ant-junit >= 1.9 Requires: jre >= 1.8.0 --Requires: python(abi) >= 2.7 ++Requires: python(abi) >= 3.6 Requires(pre): user(cassandra) Requires(pre): group(cassandra) Requires(pre): shadow-utils @@@ -67,11 -68,11 +69,11 @@@ mkdir -p %{buildroot}/var/lib/%{usernam mkdir -p %{buildroot}/var/lib/%{username}/hints mkdir -p %{buildroot}/var/run/%{username} mkdir -p %{buildroot}/var/log/%{username} - ( cd pylib && python2.7 setup.py install --no-compile --root %{buildroot}; ) + ( cd pylib && %{__python} setup.py install --no-compile --root %{buildroot}; ) # patches for data and log paths -patch -p1 < debian/patches/001cassandra_yaml_dirs.dpatch -patch -p1 < debian/patches/002cassandra_logdir_fix.dpatch +patch -p1 < debian/patches/cassandra_yaml_dirs.diff +patch -p1 < debian/patches/cassandra_logdir_fix.diff # uncomment hints_directory path sed -i 's/^# hints_directory:/hints_directory:/' conf/cassandra.yaml --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
