CASSANDRA-18753 followup: Further test fixes #3165
Conversation
patch by Branimir Lambov; reviewed by ... for CASSANDRA-18753
blambov
changed the title
|
@beobal could you review these short test fixes? |
Sure, will do |
| @@ -41,10 +41,12 @@ public void bounceTest() throws Exception | |||
| cluster.schemaChange(withKeyspace("create index idx on %s.tbl (x)")); | |||
| Object[][] res = cluster.coordinator(1).execute(withKeyspace("select * from %s.tbl where x=5"), ConsistencyLevel.ALL); | |||
| assert res.length > 0; | |||
| final String pattern = "Index build of idx complete|Index \\[idx\\] became queryable after successful build"; | |||
There was a problem hiding this comment.
It's been a while since I looked at this, so I had to code dive a bit to understand why switching between legacy 2i and SAI would necessitate this change. Would you be ok with adding a comment? Something along the lines of:
// Both SAI and legacy 2i indexes will log the "Index [idx] became queryable..." message every time the index is
// initialised. Only legacy indexes may rebuild a previously built index, in which case they log the "Index
// build of idx complete" message. So this is to verify that happens at most once, implying that legacy
// 2i does not get rebuilt after a restart.
There was a problem hiding this comment.
From what I can see, though, it does get rebuilt after the restart. With legacy index the pre-bounce count is 0 and it becomes 1 after the restart. With SAI the numbers are 1 and 2, respectively.
I really don't know what the test is supposed to verify; it is introduced with TCM and I went with the understanding that the test is checking that there is a rebuild after the restart.
There was a problem hiding this comment.
From what I can see, though, it does get rebuilt after the restart. With legacy index the pre-bounce count is 0 and it becomes 1 after the restart.
Are you sure? What I see on trunk is that the pre-bounce count is 1 and stays at 1 following the restart.
If we change the search to use your pattern that changes to 2 pre-bounce and 3 after, because we always log the Index [idx] became queryable message, whether the index was rebuilt or not.
With SAI the numbers are 1 and 2, respectively
Yes, because both SAI and legacy 2i indexes will log the Index [idx] became queryable... as I said in the comment, but SAI will never log Index build of idx complete.
I really don't know what the test is supposed to verify; it is introduced with TCM and I went with the understanding that the test is checking that there is a rebuild after the restart.
er, no it's the opposite. It's verifying that the legacy 2i index is not rebuilt after a bounce (which would cause it to log Index build of idx complete).
There was a problem hiding this comment.
I see. What I needed, then, is to identify the corresponding message for SAI.
There does not appear to be one, though, but it does show "Validating" after restart. Changed test to check that if no legacy build message was reported, then a SAI validation one must be seen post-bounce.
Fix dtest failures caused by an omitted part of the fix to avoid NPE on UCS initialization (CASSANDRA-19169).
Fix BounceIndexRebuildTest for SAI.