Sle 15 sp4 #12
Merged
Sle 15 sp4 #12
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
(bsc#1190774) Add SAPHanaSR via global.ini as proposed in https://documentation.suse.com/sbp/all/html/SLES4SAP-hana-sr-guide-PerfOpt-15/index.html#id-1.10.6.6
SUSE SAP HA Yast wizard for HANA doesn´t configure the HANA hooks.
yast2-sap-ha: S:M:24423:276258: csync2 configuration not enabled
imobachgs
reviewed
Aug 10, 2022
src/clients/sap_ha.rb
Outdated
| @@ -53,6 +54,10 @@ class SAPHAClass < Client | |||
|
|
|||
| def initialize | |||
| log.warn "--- called #{self.class}.#{__callee__}: CLI arguments are #{WFM.Args} ---" | |||
| #Take care that corosync is enabled and running | |||
| corosync = Yast2::Systemd::Service.find('corosync') | |||
There was a problem hiding this comment.
Same as https://github.com/yast/yast-sap-ha/pull/11/files#r942146359. But if we are pretty sure that the corosync service is there, it should not be a problem. Just take it into account if we decide at some point to change the dependency, or the service gets renamed or whatever.
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) | |||
src/lib/sap_ha/system/network.rb
Outdated
| @@ -41,15 +41,15 @@ def interfaces | |||
| # Get local machine's IPv4 addresses excluding the loopback iface | |||
| def ip_addresses | |||
| interfaces = Socket.getifaddrs.select do |iface| | |||
| iface.addr.ipv4? && !iface.addr.ipv4_loopback? | |||
| !iface.addr.nil? && iface.addr.ipv4? && !iface.addr.ipv4_loopback? | |||
There was a problem hiding this comment.
It is enought to say iface.addr && iface.addr.ipv4? && !iface.addr.ipv4_loopback?.
imobachgs
requested changes
Aug 10, 2022
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.
If you decide to use match?, you can drop the ! and the nil?. See #9 (comment). If you prefer, you can leave it as it was at the beginning.
|
❌ 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
Short description of the original problem.
varkoly:master