Sle 15 sp3 #9
Merged
Sle 15 sp3 #9
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
…ension but we ship .ko.xz bsc#1197290
Replace tab with spaces.
This reads the proposal for the modules watchdog and fence. This is neccessary when reading an earlier configuration.
Pull Request Test Coverage Report for Build 2832162981
💛 - Coveralls |
max lenngth 256 all ascii is allowed 33-126 instead of "*" and "/".
… from 33 until 125 expect of '*' and '/'. The identifier can be 256 character long However, for security and technical reasons, we only allow alphanumeric characters as well as '-' and '_'. The identifier must not be longer than 30 characters and it must be minimum 2 long. Add some check for SID and site identifier.
imobachgs
reviewed
Aug 10, 2022
src/lib/sap_ha/configuration.rb
Outdated
| @@ -86,6 +86,13 @@ def initialize(role = :master) | |||
| @platform = SapHA::Helpers.platform_check | |||
| end | |||
|
|
|||
| # Funktion to refresh the proposals of some modules. This is neccessary when | |||
src/lib/sap_ha/semantic_checks.rb
Outdated
| @@ -235,8 +239,7 @@ def integer_in_range(value, low, high, message = '', field_name = '') | |||
| def sap_sid(value, message = '', field_name = '') | |||
| message = "A valid SAP System ID consists of three characters, starts with a letter, and "\ | |||
| " must not collide with one of the reserved IDs" if message.nil? || message.empty? | |||
| flag = !SAP_SID_REGEXP.match(value).nil? | |||
| flag &= !RESERVED_SAP_SIDS.include?(value) | |||
| flag = !SAP_SID_REGEXP.match(value).nil? && !RESERVED_SAP_SIDS.include?(value) | |||
There was a problem hiding this comment.
what just flag = SAP_SID_REGEXP.match?(value) && !RESERVED_SAP_SIDS.include?(value)
There was a problem hiding this comment.
It should be a boolean value.
With your syntax it delivers nil if the regexp does not match and braeks the testcase:
https://github.com/yast/yast-sap-ha/runs/7764069782?check_suite_focus=true#step:6:190
src/lib/sap_ha/system/watchdog.rb
Outdated
| @@ -108,11 +108,13 @@ def installed_watchdogs | |||
|
|
|||
| # Get the list of all watchdog available in the system | |||
| def list_watchdogs | |||
| wmods = [] | |||
There was a problem hiding this comment.
np: I would say this initialization is not needed.
Merged
imobachgs
approved these changes
Aug 10, 2022
|
❌ Internal Jenkins job #1 failed |
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.
Problem
If someone select an existing configuration the proposals will not read again. Unfortunately the proposal is saved into the configuration too. That is if the proposal was empty for the first time it will be empty next time too.
Furthermore I've detected that the modules in SLE15-SP4 ends with ".ko.zst".
Solution
After reading the selected configuration a new function refresh_all_proposals will be called.
I've changed the code for listing the modules in watchdog.rb tool. Now I'm using .gsub instead of File.basename