[CHANGED] Travis build changes #680
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
- Use Ubuntu focal 20.04 - Added testing against nats-server latest release, and against the `dev` branch - Changed gcc `sanitize=address` builds to Debug to get line numbers in the output - Added `NATS_TEST_VALGRIND=yes` to `sanitize=thread` to reduce repeat counts and avoid timeouts
mtmk
approved these changes
Sep 14, 2023
Co-authored-by: Ziya Suzen <ziya@suzen.net>
levb
commented
Sep 14, 2023
test/test.c
Outdated
| @@ -16311,6 +16311,11 @@ test_ServerPoolUpdatedOnClusterUpdate(void) | |||
| const char *urls[] = {"127.0.0.1:4222", "127.0.0.1:4223", "127.0.0.1:4224"}; | |||
| test("Check pool: "); | |||
| s = _checkPool(conn, (char**)urls, (int)(sizeof(urls)/sizeof(char*))); | |||
| if (s != NATS_OK) | |||
| { | |||
| nats_Sleep(100); | |||
There was a problem hiding this comment.
@kozlovic if you don't mind a quick look here to confirm.
I think the the (connected) server was sending 2 INFO packets, the first was coming with obsolete list of URL, and then the second one would correct it. Not sure if there's a better way to wait for the second info packet to arrive in the test, but this seems to have fixed the flapping.
There was a problem hiding this comment.
I am not able to reproduce, but _checkPool() is already sleeping and waiting until it gets the expected array, but I realize that we don't retry for the expected size (just the expected content). We could improve _checkPool instead of adding the sleep here...
kozlovic
approved these changes
Sep 14, 2023
| @@ -7430,14 +7430,15 @@ _checkPool(natsConnection *nc, char **expectedURLs, int expectedURLsCount) | |||
| bool ok; | |||
|
|
|||
| natsMutex_Lock(nc->mu); | |||
| if (nc->srvPool->size != expectedURLsCount) | |||
There was a problem hiding this comment.
You could still have this "if/print error" statement at the end (before releasing the mutex) so that we have this printed in case it helps.
...
if (nc->srvPool->size != expectedURLsCount)
printf("Expected pool size to be %d, got %d\n", expectedURLsCount, nc->srvPool->size);
natsMutex_Unlock(nc->mu);
return NATS_ERR;
}
There was a problem hiding this comment.
@kozlovic this seemed like a 1-liner to add, but upon further reading the function, I don't think the retry logic was quite correct, so I refactored the function.
levb
added a commit
that referenced
this pull request
Oct 12, 2023
* [CHANGED] Travis build changes (#680) * [CHANGED] Travis build changes - Use Ubuntu focal 20.04 - Added testing against nats-server latest release, and against the `dev` branch - Changed gcc `sanitize=address` builds to Debug to get line numbers in the output - Added `NATS_TEST_VALGRIND=yes` to `sanitize=thread` to reduce repeat counts and avoid timeouts * Update buildOnTravis.sh Co-authored-by: Ziya Suzen <ziya@suzen.net> * Fixed flapping test_ServerPoolUpdatedOnClusterUpdate * PR feedback: test _checkPool to retry # subjects * PR feedback: refactored _checkPool --------- Co-authored-by: Ziya Suzen <ziya@suzen.net> * [ADDED] Support for (multiple) ConsumerConfig.FilterSubjects (#679) * [CHANGED] Travis build changes - Use Ubuntu focal 20.04 - Added testing against nats-server latest release, and against the `dev` branch - Changed gcc `sanitize=address` builds to Debug to get line numbers in the output - Added `NATS_TEST_VALGRIND=yes` to `sanitize=thread` to reduce repeat counts and avoid timeouts * Update buildOnTravis.sh Co-authored-by: Ziya Suzen <ziya@suzen.net> * Fixed flapping test_ServerPoolUpdatedOnClusterUpdate * [ADDED] Support for (multiple) ConsumerConfig.FilterSubjects * PR feedback: took out a redundant check * point travis to build with NATS main, not dev --------- Co-authored-by: Ziya Suzen <ziya@suzen.net> * [Added] More v2.10 related changes (#682) * Added Metadata to Stream, Consumer configs Merged some other fixes from go PR * leak * Added jsStreamConfig.Compression * Added jsStreamConfig.FirstSeq * Added jsStreamConfig.SubjectTransform * Added jsStreamSourceInfo.SubjectTransforms and .FilterSubjects * Added jsStreamConfig.ConsumerLimits * PR feedback: nits * PR feedback: verify metadata values in test * PR feedback: fix a cast * Fixed the broken test (order of values) --------- Co-authored-by: Ziya Suzen <ziya@suzen.net>
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.
This PR prepares for testing with nats server v2.10 changes. It also fixes an issue with
sanitize=threadthat seemed to have appeared due to Travisbionicimage changes.focalv20.04latestrelease, and against thedevbranchsanitize=addressbuilds to Debug to get line numbers in the outputNATS_TEST_VALGRIND=yestosanitize=threadto reduce repeat counts and avoid timeouts