fix(sentinel): load classpath rule files from packaged JARs - #4396
Open
Rajandeep56 wants to merge 1 commit into
Open
fix(sentinel): load classpath rule files from packaged JARs#4396Rajandeep56 wants to merge 1 commit into
Rajandeep56 wants to merge 1 commit into
Conversation
|
|
This file contains hidden or 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
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.
Describe what this PR does / why we need it
When Sentinel file rules are configured as a classpath resource (for example
classpath:sentinel.json), the app works in an IDE but fails afterjava -jarwith:FileNotFoundException: class path resource [sentinel.json] cannot be resolved to absolute file path because it does not reside in the file systemFileDataSourceProperties.preCheckalways converted the location withResourceUtils.getFile(), which cannot resolve files packed inside a JAR.Does this pull request fix one issue?
Fixes #462
Describe how you did it
If
ResourceUtils.getFile()fails, load the SpringResourceas anInputStreamand copy it to a temp file.FileRefreshableDataSourcestill receives ajava.io.File, so filesystem files are unchanged.Describe how to verify it
spring.cloud.sentinel.datasource.ds1.file.file=classpath:flowrule.json.java -jar. Startup should succeed and rules should load from the classpath file in the JAR../mvnw -pl spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource -am testSpecial notes for reviews
JAR-packed rule files are copied to a temp file (
deleteOnExit). They are not watched for live updates, which matches Sentinel’s assumption that files inside a JAR are immutable.