CASSANDRA-16183 #1
Open
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
adelapena
reviewed
Nov 6, 2020
client_request_metrics_test.py
Outdated
Comment on lines
115
to
120
| global_diff, cl_diff = self.validate_nominal('Write', | ||
| WriteMetrics, | ||
| SimpleStatement(f"INSERT INTO {KEYSPACE}.{TABLE} (k,c) VALUES (0,0)", consistency_level=CL.ONE), | ||
| query_count) | ||
|
|
||
| assert global_diff['MutationSizeHistogram.Count'] == query_count |
There was a problem hiding this comment.
We could easily test all valid consistency levels here, instead on only CL.ONE:
Suggested change
| global_diff, cl_diff = self.validate_nominal('Write', | |
| WriteMetrics, | |
| SimpleStatement(f"INSERT INTO {KEYSPACE}.{TABLE} (k,c) VALUES (0,0)", consistency_level=CL.ONE), | |
| query_count) | |
| assert global_diff['MutationSizeHistogram.Count'] == query_count | |
| query = f"INSERT INTO {KEYSPACE}.{TABLE} (k,c) VALUES (0,0)" | |
| for cl in (CL.LOCAL_ONE, CL.ONE, CL.TWO, CL.ALL, CL.ANY, CL.LOCAL_QUORUM): | |
| global_diff, cl_diff = self.validate_nominal('Write', | |
| WriteMetrics, | |
| SimpleStatement(query, consistency_level=cl), | |
| query_count) |
client_request_metrics_test.py
Outdated
Comment on lines
124
to
127
| self.validate_nominal('Read', | ||
| ClientRequestMetrics, | ||
| SimpleStatement(f"SELECT k FROM {KEYSPACE}.{TABLE} WHERE k=0 AND c=0", consistency_level=CL.LOCAL_ONE), | ||
| query_count) |
There was a problem hiding this comment.
Here we could also test more consistency levels:
Suggested change
| self.validate_nominal('Read', | |
| ClientRequestMetrics, | |
| SimpleStatement(f"SELECT k FROM {KEYSPACE}.{TABLE} WHERE k=0 AND c=0", consistency_level=CL.LOCAL_ONE), | |
| query_count) | |
| query = f"SELECT k FROM {KEYSPACE}.{TABLE} WHERE k=0 AND c=0" | |
| for cl in (CL.LOCAL_ONE, CL.ONE, CL.TWO, CL.ALL, CL.LOCAL_QUORUM): | |
| self.validate_nominal('Read', | |
| ClientRequestMetrics, | |
| SimpleStatement(query, consistency_level=cl), | |
| query_count) |
|
|
||
| def write_failures_variant(self, scope, constraint, query_count, validator, metric_class): | ||
| validator = self.validate_metric if validator is None else validator | ||
| query_cl = CL.ONE |
There was a problem hiding this comment.
We could pass the consistency level as an argument so the two callers can test different CLs.
| return diff | ||
|
|
||
| def write_unavailables(self): | ||
| query_cl = CL.THREE |
There was a problem hiding this comment.
We could add a short comment indicating that the writes are unavailable because the replication factor is 2.
client_request_metrics_test.py
Outdated
| for _ in range(query_count): | ||
| try: | ||
| self.session.execute(statement) | ||
| # self.session.execute(statement, execution_profile=exe_profile, timeout=20) |
There was a problem hiding this comment.
I guess this is a leftover from previous changes
client_request_metrics_test.py
Outdated
| def cas_write_failures(self): | ||
| query_count = 2 | ||
| diff = self.write_failures_variant('CASWrite', f"WHERE k={new_key()} AND c=0 IF v!=0", | ||
| query_count, |
There was a problem hiding this comment.
Nit: misaligned
Suggested change
| query_count, | |
| query_count, |
adelapena
reviewed
Nov 9, 2020
client_request_metrics_test.py
Outdated
| 'Unavailables', | ||
| Unavailable | ||
| ) | ||
| self.start_cluster() |
There was a problem hiding this comment.
I think we can use just node2.start. The JVM properties that we pass in start_cluster can be placed in a static property to be reused here. If we do so there would be a single call to the start_cluster method in setup_once, so we could get rid of start_cluster. WDYT?
client_request_metrics_test.py
Outdated
Comment on lines
438
to
440
| # The way we're failing writes causes a StorageProxy::cas to throw before the metric is | ||
| # incremented on each request after the first one. We find the previous ballot in-progress and fail trying to | ||
| # commit it. |
There was a problem hiding this comment.
Suggested change
| # The way we're failing writes causes a StorageProxy::cas to throw before the metric is | |
| # incremented on each request after the first one. We find the previous ballot in-progress and fail trying to | |
| # commit it. | |
| # The way we're failing writes causes a StorageProxy::cas to throw before the metric is incremented on each | |
| # request after the first one. We find the previous ballot in-progress and fail trying to commit it. |
adelapena
reviewed
Nov 9, 2020
client_request_metrics_test.py
Outdated
Comment on lines
421
to
424
| CASClientWriteRequestMetrics, | ||
| SimpleStatement(f"INSERT INTO {KEYSPACE}.{TABLE} (k,c) VALUES (0,0) IF NOT EXISTS", | ||
| consistency_level=CL.ONE), | ||
| 2) |
There was a problem hiding this comment.
Nit: alignement
Suggested change
| CASClientWriteRequestMetrics, | |
| SimpleStatement(f"INSERT INTO {KEYSPACE}.{TABLE} (k,c) VALUES (0,0) IF NOT EXISTS", | |
| consistency_level=CL.ONE), | |
| 2) | |
| CASClientWriteRequestMetrics, | |
| SimpleStatement(f"INSERT INTO {KEYSPACE}.{TABLE} (k,c) VALUES (0,0) IF NOT EXISTS", | |
| consistency_level=CL.ONE), | |
| 2) |
client_request_metrics_test.py
Outdated
Comment on lines
430
to
436
|
|
||
|
|
client_request_metrics_test.py
Outdated
|
|
||
| def validate(self): | ||
| assert self.values['RateUnit'] == 'events/second' | ||
| for k,v in self.values.items(): |
There was a problem hiding this comment.
Nit: missed space
Suggested change
| for k,v in self.values.items(): | |
| for k, v in self.values.items(): |
client_request_metrics_test.py
Outdated
| assert all(isinstance(i, int) for i in l), k | ||
|
|
||
|
|
||
| k = 0 |
There was a problem hiding this comment.
Super nit: we could rename k to something like current_key or last_key to avoid name shadowing on the methods before.
client_request_metrics_test.py
Outdated
|
|
||
| def is_histo_list(k, l): | ||
| # since these values change on sampling, we can only generally verify it takes the proper form | ||
| # there is a dedicated test to make sure the histogram behaves as expected. |
There was a problem hiding this comment.
We could also indicate here which test
aholmberg
force-pushed
the
CASSANDRA-16183
branch
from
f38564e
to
f73712b
Compare
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.
No description provided.