Hotfix/The Correct Bundle Update behavior #602
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
PengZheng
added
the
do-not-merge/work-in-progress
Codecov Report
@@ Coverage Diff @@
## master #602 +/- ##
==========================================
+ Coverage 79.68% 79.70% +0.02%
==========================================
Files 256 256
Lines 34686 34686
==========================================
+ Hits 27640 27647 +7
+ Misses 7046 7039 -7
... and 2 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
PengZheng
changed the title
PengZheng
removed
the
do-not-merge/work-in-progress
PengZheng
changed the title
PengZheng
changed the title
pnoltes
approved these changes
Aug 2, 2023
libs/framework/src/bundle_archive.c
Outdated
| fw_logCode(archive->fw->logger, CELIX_LOG_LEVEL_ERROR, status, "Failed to stat bundle archive directory '%s'", archive->resourceCacheRoot); | ||
| return status; | ||
| } | ||
| // assert(status == 0); |
| celixThreadMutex_unlock(&cache->mutex); | ||
| (void) bundleArchive_destroy(archive); | ||
| return status; | ||
| bundleArchive_destroy(archive); | ||
| } | ||
|
|
||
| /** | ||
| * Update location->bundle id lookup map. | ||
| */ | ||
| static void celix_bundleCache_updateIdForLocationLookupMap(celix_bundle_cache_t* cache) { |
There was a problem hiding this comment.
Just noticed that the char* bundleStateProperties = celix_utils_writeOrCreateString(..) string at line 261 is never freed with celix_utils_freeStringIfNotEqual
| } | ||
|
|
||
| long celix_bundleCache_findBundleIdForLocation(celix_bundle_cache_t* cache, const char* location) { | ||
| long bndId = -1; | ||
| celixThreadMutex_lock(&cache->mutex); | ||
| if (!cache->locationToBundleIdLookupMapLoaded) { | ||
| celix_bundleCache_updateIdForLocationLookupMap(cache); |
There was a problem hiding this comment.
Yes of course, this is only needed once.
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 implements the correct bundle update behavior when updating from a different bundle location.
Previously if the bundle at that location is older than the bundle in cache, bundle extraction will be skipped, which will fail
the newly added
TEST_F(CelixBundleContextBundlesTestSuite, ForceUpdateUsingBundleFromDifferentLocation).This PR will always update the bundle cache if the external bundle comes from a different location, which is the behavior we advertise in the API documentation.
This PR also improves startup speed when starting with a clean cache.
Previously the framework will traverse the cache directory once for each newly installed bundles (with unknown bundle id).
celix_bundleCache_updateIdForLocationLookupMapcould be invoked bycelix_bundleCache_create.But that would lead to unnecessary disk load when the launcher is just used to create bundle cache.