Repository navigation
Fix template activation path resolution and ancestor template matching - #19041
Merged
Merged
Conversation
…tivateTemplateStatement.getPath()
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.
Two template bugs also exist on dev/1.3:
BatchActivateTemplateStatement.getPaths()andInternalBatchActivateTemplateStatement.getPaths()collect themeasurements of all matched templates into a single list and then concatenate them with every device path. A device
resolved to one template is therefore checked with other templates' measurements, and devices without a template still
contribute paths.
ClusterTemplateManager.checkTemplateSetInfo()uses the bidirectionalstartsWithOrPrefixOf(), so an ancestordevice (e.g.
root.sg) matches a template mounted on a descendant (e.g.root.sg.v1).Fix
PartialPath.startsWithOrEqual()and use it incheckTemplateSetInfo(), so that only the mount path itself orits descendants match.
checkTemplateSetAndPreSetInfo()keeps the bidirectional check, since an ancestor is still aconflict when creating a measurement.