natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove legacy 3.0/3.11 buffer pool metrics 

patch by Mick Semb Wever; reviewed by Brandon Williams, Maxim Muzafarov for CASSANDRA-18313
This commit is contained in:
Mick Semb Wever 2023-03-09 14:11:19 +01:00
parent ad26ffcd57
commit 3bf9bd6831
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
5.0
* Remove legacy 3.0/3.11 buffer pool metrics (CASSANDRA-18313)
* Add AzureSnitch (CASSANDRA-18646)
* Implementation of the Unified Compaction Strategy as described in CEP-26 (CASSANDRA-18397)
* Upgrade commons cli to 1.5.0 (CASSANDRA-18659)

2
NEWS.txt
View File

@ -202,6 +202,8 @@ Upgrading
communicate with AWS IMDS of version 2. This change is transparent, there does not need
to be done anything upon upgrade. Furthermore, IMDS of version 2 can be configured to be required in AWS EC2 console.
Consult cassandra-rackdc.properties for more details. (CASSANDRA-16555)
- JMX MBean `org.apache.cassandra.metrics:type=BufferPool` without scope has been removed.
Use instead `org.apache.cassandra.metrics:type=BufferPool,scope=chunk-cache`. (CASSANDRA-17668)
Deprecation

9
src/java/org/apache/cassandra/metrics/BufferPoolMetrics.java
View File

@ -64,13 +64,4 @@ public class BufferPoolMetrics
size = Metrics.register(factory.createMetricName("Size"), bufferPool::sizeInBytes);
}
/**
* used to register alias for 3.0/3.11 compatibility
*/
public void register3xAlias()
{
MetricNameFactory legacyFactory = new DefaultNameFactory("BufferPool");
Metrics.registerMBean(misses, legacyFactory.createMetricName("Misses").getMBeanName());
Metrics.registerMBean(size, legacyFactory.createMetricName("Size").getMBeanName());
}
}

1
src/java/org/apache/cassandra/utils/memory/BufferPools.java
View File

@ -52,7 +52,6 @@ public class BufferPools
prettyPrintMemory(NETWORKING_MEMORY_USAGE_THRESHOLD),
NETWORKING_POOL.name);
CHUNK_CACHE_POOL.metrics().register3xAlias();
}
/**
* Long-lived buffers used for chunk cache and other disk access

8
test/unit/org/apache/cassandra/tools/JMXCompatabilityTest.java
View File

@ -97,6 +97,7 @@ public class JMXCompatabilityTest extends CQLTester
{
List<String> excludeObjects = newArrayList("org.apache.cassandra.metrics:type=ThreadPools.*",
"org.apache.cassandra.internal:.*",
"org.apache.cassandra.metrics:type=BufferPool,name=(Misses|Size)", // removed in CASSANDRA-18313
"org.apache.cassandra.metrics:type=DroppedMessage.*",
"org.apache.cassandra.metrics:type=ClientRequest,scope=CASRead,name=ConditionNotMet",
"org.apache.cassandra.metrics:type=Client,name=connectedThriftClients", // removed in CASSANDRA-11115
@ -133,6 +134,7 @@ public class JMXCompatabilityTest extends CQLTester
{
List<String> excludeObjects = newArrayList("org.apache.cassandra.metrics:type=ThreadPools.*", //lazy initialization in 4.0
"org.apache.cassandra.internal:.*",
"org.apache.cassandra.metrics:type=BufferPool,name=(Misses|Size)", // removed in CASSANDRA-18313
"org.apache.cassandra.metrics:type=DroppedMessage,scope=PAGED_RANGE.*", //it was deprecated in the previous major version
"org.apache.cassandra.metrics:type=Client,name=connectedThriftClients", // removed in CASSANDRA-11115
"org.apache.cassandra.request:type=ReadRepairStage", // removed in CASSANDRA-13910
@ -169,7 +171,8 @@ public class JMXCompatabilityTest extends CQLTester
@Test
public void diff40() throws Throwable
{
List<String> excludeObjects = newArrayList();
List<String> excludeObjects = newArrayList("org.apache.cassandra.metrics:type=BufferPool,name=(Misses|Size)" // removed in CASSANDRA-18313
);
List<String> excludeAttributes = newArrayList();
List<String> excludeOperations = newArrayList();
@ -185,7 +188,8 @@ public class JMXCompatabilityTest extends CQLTester
@Test
public void diff41() throws Throwable
{
List<String> excludeObjects = newArrayList();
List<String> excludeObjects = newArrayList("org.apache.cassandra.metrics:type=BufferPool,name=(Misses|Size)" // removed in CASSANDRA-18313
);
List<String> excludeAttributes = newArrayList();
List<String> excludeOperations = newArrayList();