|
 |
a9c9ca |
From 42d6ce2143f4439fed8c8b31e03dde655f1bbadb Mon Sep 17 00:00:00 2001
|
|
|
a9c9ca |
From: Frank Danapfel <frank.danapfel@redhat.com>
|
|
|
a9c9ca |
Date: Tue, 21 Apr 2020 14:11:36 +0200
|
|
|
a9c9ca |
Subject: [PATCH] Allow nodenames with dashes and/or underscores in lsn
|
|
|
a9c9ca |
function
|
|
|
a9c9ca |
|
|
|
a9c9ca |
---
|
|
|
a9c9ca |
sap_cluster_connector-f3644f5/redhat/sap_cluster_connector | 6 +++---
|
|
|
a9c9ca |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
a9c9ca |
|
|
|
a9c9ca |
diff --git a/sap_cluster_connector-f3644f5/sap_cluster_connector-f3644f5/redhat/sap_cluster_connector b/redhat/sap_cluster_connector
|
|
|
a9c9ca |
index a88b27a..6250887 100755
|
|
|
a9c9ca |
--- a/sap_cluster_connector-f3644f5/redhat/sap_cluster_connector
|
|
|
a9c9ca |
+++ b/sap_cluster_connector-f3644f5/redhat/sap_cluster_connector
|
|
|
a9c9ca |
@@ -401,7 +401,7 @@ sub list_sap_nodes {
|
|
|
a9c9ca |
chomp $crm_res_location_in;
|
|
|
a9c9ca |
#printf "DBG: where-result: %s\n", $crm_res_location_in;
|
|
|
a9c9ca |
my $current_node="";
|
|
|
a9c9ca |
- if ( $crm_res_location_in =~ /^resource\s+(\w)+\sis running on:\s+(\w+)\W*/ ) {
|
|
|
a9c9ca |
+ if ( $crm_res_location_in =~ /^resource\s+(\w)+\sis running on:\s+([a-zA-Z0-9_-]+)/ ) {
|
|
|
a9c9ca |
#printf "DBG: where-result: match\n";
|
|
|
a9c9ca |
$current_node = $2;
|
|
|
a9c9ca |
}
|
|
|
a9c9ca |
@@ -425,12 +425,12 @@ sub list_sap_nodes {
|
|
|
a9c9ca |
while (<PTEST>) {
|
|
|
a9c9ca |
chomp;
|
|
|
a9c9ca |
# printf "%s\n", $_;
|
|
|
a9c9ca |
- if ( /^group_color:\s*(\w+)\s+allocation score on\s+(\w+):\s+(.*)$/ ) {
|
|
|
a9c9ca |
+ if ( /^group_color:\s*(\w+)\s+allocation score on\s+([a-zA-Z0-9_-]+):\s+(.*)$/ ) {
|
|
|
a9c9ca |
# printf "DBG: group 1: %s, 2: %s, 3: %s\n", $1, $2, $3;
|
|
|
a9c9ca |
$resource{$1}->{nodes}->{$2}->{gc}=$3;
|
|
|
a9c9ca |
push(@{$resource{$1}->{priorities}->{$3}}, $2);
|
|
|
a9c9ca |
}
|
|
|
a9c9ca |
- if ( /^native_color:\s*(\w+)\s+allocation score on\s+(\w+):\s+(.*)$/ ) {
|
|
|
a9c9ca |
+ if ( /^native_color:\s*(\w+)\s+allocation score on\s+([a-zA-Z0-9_-]+):\s+(.*)$/ ) {
|
|
|
a9c9ca |
# printf "DBG: native 1: %s, 2: %s, 3: %s\n", $1, $2, $3;
|
|
|
a9c9ca |
$resource{$1}->{nodes}->{$2}->{nc}=$3;
|
|
|
a9c9ca |
push(@{$resource{$1}->{priorities}->{$3}}, $2);
|