Merge 4.18.0 #307
Merged
Merge 4.18.0 #307
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…voked: schemaListener1.onSessionReady (apache#1670) ListenersIT.java: - Add 500ms wait on SchemaListener#onSessionReady call verification - Add latch to wait for MySchemaChangeListener#onSessionReady - Add some comments around which listeners/methods need synchronizations and why/not
jackson-jaxrs-json-provider to 2.13.4 to address recent CVEs Additional: - Remove unused maven property legacy-jackson.version
…se @BackendRequirement (apache#1667) Refactor @BackendRequirement test skipping logic into new rule, BackendRequirementRule.
…ust not send frame with WARNING flag for native protocol version < 4 (apache#1669) NullSavingStrategyIT.java: - Remove V3 protocol configuration from class SessionRule - Create new session configured with V3 protocol in @BeforeClass method to use in tests
removed all snyk related stuff
…ts with specified jvm (apache#1719) Additionally: - Set --jvm_version=8 when running dse 6.8.19+ with graph workloads (DSP-23501) - Update commons-configuration2 to 2.9.0 + deps in BundleOptions to support java17 - Update felix framework version to 7.0.1 for java17 (FELIX-6287) - Pick up newer bndlib for ArrayIndexOutOfBounds error printed with OsgiGraphIT (bndtools/bnd issue#3405) - Update pax-url-wrap to 2.6.4 (and bring pax-url-reference up to the same version) - Force newer tinybundles version 3.0.0 (default 2.1.1 version required older bndlib)
apache#1689) * add support for publishing percentile time series for the histogram metrics cql-requests, cql-messages and throttling delay. Motivation: Histogram metrics is generating too many metrics overloading the promethous servers. if application has 500 Vms and 1000 cassandra nodes, The histogram metrics generates 100*500*1000 = 50,000,000 time series every 30 seconds. This is just too much metrics. Let us say we can generate percentile 95 timeseries for for every cassandra nodes, then we only have 1*500 = 500 metrics and in applciation side, we can ignore the _bucket time series. This way there will be very less metrics. Modifications: add configurable pre-defined percentiles to Micrometer Timer.Builder.publishPercentiles. This change is being added to cql-requests, cql-messages and throttling delay. Result: Based on the configuration, we will see additonal quantile time series for cql-requests, cql-messages and throttling delay histogram metrics. * add support for publishing percentile time series for the histogram metrics cql-requests, cql-messages and throttling delay. Motivation: Histogram metrics is generating too many metrics overloading the promethous servers. if application has 500 Vms and 1000 cassandra nodes, The histogram metrics generates 100*500*1000 = 50,000,000 time series every 30 seconds. This is just too much metrics. Let us say we can generate percentile 95 timeseries for for every cassandra nodes, then we only have 1*500 = 500 metrics and in applciation side, we can ignore the _bucket time series. This way there will be very less metrics. Modifications: add configurable pre-defined percentiles to Micrometer Timer.Builder.publishPercentiles. This change is being added to cql-requests, cql-messages and throttling delay. Result: Based on the configuration, we will see additonal quantile time series for cql-requests, cql-messages and throttling delay histogram metrics. * using helper method as suggested in review * fixes as per review comments * add configuration option which switches aggregable histogram generation on/off for all metric flavors [default=on] * updating java doc * rename method to publishPercentilesIfDefined * renmae method --------- Co-authored-by: Nagappa Paraddi <[email protected]>
…ndra-java-driver.html ) patch by Mick Semb Wever; reviewed by Henry Hughes for CASSANDRA-18611
patch by Henry Hughes; reviewed by Mick Semb Wever for CASSANDRA-18969
patch by Claude Warren; reviewed by Henry Hughes, Mick Semb Wever for CASSANDRA-18969
patch by Claude Warren; reviewed by Henry Hughes, Mick Semb Wever for CASSANDRA-18969
LICENSE + NOTICE.txt is added to source jars, LICENSE + NOTICE_binary.txt is added to regular jars. Make parent project inherit from apache pom. Updated NOTICE wording to "developed at ..." per latest instructions. patch by Henry Hughes; reviewed by Mick Semb Wever for CASSANDRA-18969
…alls * Source files missing from sources jars due to maven-source-plugin include rule * New submodule to generate distribution source tarball * Binary/source tarball artifacts should be prefixed with apache-cassandra * Change groupId to org.apache.cassandra * Remove javadoc jars (javadoc plugin is still used for leak detections) * Create binary versions for LICENSE and NOTICE, with licenses and entries for asm, HdrHistogram, jnr-posix, jnr-x86asm, reactive-streams, slf4j-api * Add checksums to distribution tarballs, and clean toplevel readme a little patch by Henry Hughes; reviewed by Mick Semb Wever for CASSANDRA-18969
|
There are 2 new modules that I've removed after conflict resolution, but maybe I should've just renamed their groupId to com.scylladb? Specifically This is very likely not ready for merge because I could've merged in something that did not really conflict with anything but should not be merged in anyway. From what I've seen most of the conflicts were due to:
|
|
On another look I don't see anything besides |
|
Some of the tests are failing, I still need to look into that. |
…tion tests) patch by Mick Semb Wever; reviewed by Wei Deng for CASSANDRA-18970 (cherry picked from commit 8d5849c)
Adds ScyllaSkip annotation to PreparedStatementIT.handle_id_changes_on_reprepare() This is a test method that comes with the most recent merge with 4.18.0 It checks if in case of performing `USE <keyspace>` the server side will not reprepare the statement under different ID if keyspace was already defined in query string. It seems it works this way in select versions of Cassandra up to 4.0.1 and every higher than that.
This test fails due to negotiating protocol version v4, while this feature requires protocol version v5 which seems to not be fully supported by Scylla. Adding ScyllaSkip annotation to the test. It can be re-enabled later.
|
I think this is ready to merge, but needs to be reviewed. |
|
@avelanarius please give high priority for review |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adding most of the changes from last merge up to 4.18.0 with slight modifications to resolve conflicts.