From a36c4cf4443c36c4c0fd815fbf3becdc49dae448 Mon Sep 17 00:00:00 2001 From: zaky Date: Mon, 28 May 2018 07:46:31 +0200 Subject: [PATCH] hostname regular pattern repairment --- .../common-services/SOLR/5.5.5/package/scripts/solr_utils.py | 2 +- .../common-services/SOLR/6.6.2/package/scripts/solr_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/solr_utils.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/solr_utils.py index 27f9c89..21f7ed7 100755 --- a/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/solr_utils.py +++ b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/solr_utils.py @@ -9,7 +9,7 @@ COLLECTION_PATTERN = "{solr_hdfs_directory}/[a-zA-Z0-9\._-]+" CORE_PATTERN = "{collection_path}\/core_node[0-9]+" WRITE_LOCK_PATTERN = "{0}/data/index/write.lock " -HOSTNAME_VERIFIER_PATTERN = "{core_node_name}\":{{((?![^_]shard|core_node).)*\"node_name\":\"{solr_hostname}" +HOSTNAME_VERIFIER_PATTERN = "{core_node_name}\":{{((?!\"shard|\"core_node).)*\"node_name\":\"{solr_hostname}" def solr_port_validation(): diff --git a/src/main/mpack/common-services/SOLR/6.6.2/package/scripts/solr_utils.py b/src/main/mpack/common-services/SOLR/6.6.2/package/scripts/solr_utils.py index 27f9c89..21f7ed7 100755 --- a/src/main/mpack/common-services/SOLR/6.6.2/package/scripts/solr_utils.py +++ b/src/main/mpack/common-services/SOLR/6.6.2/package/scripts/solr_utils.py @@ -9,7 +9,7 @@ COLLECTION_PATTERN = "{solr_hdfs_directory}/[a-zA-Z0-9\._-]+" CORE_PATTERN = "{collection_path}\/core_node[0-9]+" WRITE_LOCK_PATTERN = "{0}/data/index/write.lock " -HOSTNAME_VERIFIER_PATTERN = "{core_node_name}\":{{((?![^_]shard|core_node).)*\"node_name\":\"{solr_hostname}" +HOSTNAME_VERIFIER_PATTERN = "{core_node_name}\":{{((?!\"shard|\"core_node).)*\"node_name\":\"{solr_hostname}" def solr_port_validation():