Skip to content

Commit aefd2b8

Browse files
author
Michael Penick
committed
CPP-884 Deprecate pending request timeouts metric
Also, remove unused internal logic and test
1 parent 3f27f5c commit aefd2b8

File tree

4 files changed

+2
-26
lines changed

4 files changed

+2
-26
lines changed

include/cassandra.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ typedef struct CassMetrics_ {
423423

424424
struct {
425425
cass_uint64_t connection_timeouts; /**< Occurrences of a connection timeout */
426-
cass_uint64_t pending_request_timeouts; /**< Occurrences of requests that timed out waiting for a connection */
426+
cass_uint64_t pending_request_timeouts; /**< Deprecated */
427427
cass_uint64_t request_timeouts; /**< Occurrences of requests that timed out waiting for a request to finish */
428428
} errors; /**< Error metrics */
429429
} CassMetrics;

src/metrics.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,6 @@ class Metrics : public Allocated {
420420
, request_rates(&thread_state_)
421421
, total_connections(&thread_state_)
422422
, connection_timeouts(&thread_state_)
423-
, pending_request_timeouts(&thread_state_)
424423
, request_timeouts(&thread_state_) {}
425424

426425
void record_request(uint64_t latency_ns) {
@@ -446,7 +445,6 @@ class Metrics : public Allocated {
446445
Counter total_connections;
447446

448447
Counter connection_timeouts;
449-
Counter pending_request_timeouts;
450448
Counter request_timeouts;
451449

452450
private:

src/session.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void cass_session_get_metrics(const CassSession* session, CassMetrics* metrics)
136136
metrics->stats.exceeded_pending_requests_water_mark = 0; // Deprecated
137137

138138
metrics->errors.connection_timeouts = internal_metrics->connection_timeouts.sum();
139-
metrics->errors.pending_request_timeouts = internal_metrics->pending_request_timeouts.sum();
139+
metrics->errors.pending_request_timeouts = 0; // Deprecated
140140
metrics->errors.request_timeouts = internal_metrics->request_timeouts.sum();
141141
}
142142

tests/src/integration/tests/test_metrics.cpp

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,28 +76,6 @@ CASSANDRA_INTEGRATION_TEST_F(MetricsTests, ErrorsConnectionTimeouts) {
7676
EXPECT_GE(2u, metrics.errors.connection_timeouts);
7777
}
7878

79-
/**
80-
* This test ensures that the driver is reporting the proper timeouts for pending requests
81-
*
82-
* @since 2.0.0
83-
* @jira_ticket CPP-188
84-
*/
85-
CASSANDRA_INTEGRATION_TEST_F(MetricsTests, ErrorsPendingRequestTimeouts) {
86-
CHECK_FAILURE;
87-
CHECK_VERSION(2.1.2);
88-
89-
for (int n = 0; n < 1000; ++n) {
90-
session_.execute_async(SELECT_ALL_SYSTEM_LOCAL_CQL);
91-
}
92-
93-
CassMetrics metrics = session_.metrics();
94-
for (int i = 0; i < 100 && metrics.errors.pending_request_timeouts == 0; ++i) {
95-
metrics = session_.metrics();
96-
msleep(100);
97-
}
98-
EXPECT_GT(metrics.errors.pending_request_timeouts, 0u);
99-
}
100-
10179
/**
10280
* This test ensures that the driver is reporting the proper timeouts for requests
10381
*

0 commit comments

Comments
 (0)