Fixed memory label to align to CASSANDRA-9692 #485
Merged
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
|
|
||
| for info in infos: | ||
| with self.assertRaises(RuntimeError): | ||
| ccmlib.node._get_load_from_info_output(info) | ||
|
|
||
| def test_gets_correct_value(self): | ||
| info_value = [('Load : 328.45 KB', decimal.Decimal('328.45')), | ||
| ('Load : 295.72 MB', decimal.Decimal('295.72') * 1024), | ||
| ('Load : 183.79 GB', |
There was a problem hiding this comment.
We still want correct handling of GB on versions that use it, so could you add tests for the GiB behavior, rather than replacing these? (and the same for other X{,i}B units)
There was a problem hiding this comment.
(I realize that this means asking you to fix tests that were broken when you got here. Sorry about that)
There was a problem hiding this comment.
They look great, +1 from me on the changes to the tests based on visual inspection.
jkni
force-pushed
the
CASS-9692-trunk-fix
branch
from
693b61c
to
a82b972
Compare
|
+1 |
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.
CASSANDRA-9692 unifies/improves logging/output of data sizes and rates throughout C*.
As part of this normalization, it changes the output of nodetool info to use the correct SI prefixes. The only dependency on this I could locate for CCM is in its parsing of the nodetool info output. This parsing happens in a function without the C* version available, so we can't do a version check to determine correct units. This PR proposes the easy route of supporting both unit types; another option is to refactor the tests/call sites to pass in a C* version, so that we can decide based on version.
(Please note that I'm reviewer for the above ticket, not assignee. PRing this since it is a new contributor and managing a C* ticket/CCM PR/dtest PR isn't the easiest thing).