flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ches...@apache.org
Subject flink git commit: [FLINK-6181][Start scripts] Fix regex in start scripts
Date Wed, 05 Apr 2017 21:08:27 GMT
Repository: flink
Updated Branches:
  refs/heads/release-1.2 36b068b08 -> d2a8df4c5


[FLINK-6181][Start scripts] Fix regex in start scripts

This closes #3605.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d2a8df4c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d2a8df4c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d2a8df4c

Branch: refs/heads/release-1.2
Commit: d2a8df4c5556ec30c0de0f8bf874d6c2395a5cbf
Parents: 36b068b
Author: Robert Metzger <rmetzger@apache.org>
Authored: Fri Mar 24 11:50:11 2017 +0100
Committer: zentol <chesnay@apache.org>
Committed: Wed Apr 5 23:08:11 2017 +0200

----------------------------------------------------------------------
 flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh | 2 +-
 flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/d2a8df4c/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh b/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh
index 67d5349..cc8917b 100755
--- a/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh
+++ b/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh
@@ -35,7 +35,7 @@ while read server ; do
     server=$(echo -e "${server}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') # trim
 
     # match server.id=address[:port[:port]]
-    if [[ $server =~ ^server\.([0-9])+[[:space:]]*\=([^: \#]+) ]]; then
+    if [[ $server =~ ^server\.([0-9]+)[[:space:]]*\=[[:space:]]*([^: \#]+) ]]; then
         id=${BASH_REMATCH[1]}
         address=${BASH_REMATCH[2]}
 

http://git-wip-us.apache.org/repos/asf/flink/blob/d2a8df4c/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh b/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh
index b306648..29ddae4 100755
--- a/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh
+++ b/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh
@@ -35,7 +35,7 @@ while read server ; do
     server=$(echo -e "${server}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') # trim
 
     # match server.id=address[:port[:port]]
-    if [[ $server =~ ^server\.([0-9])+[[:space:]]*\=([^: \#]+) ]]; then
+    if [[ $server =~ ^server\.([0-9]+)[[:space:]]*\=[[:space:]]*([^: \#]+) ]]; then
         id=${BASH_REMATCH[1]}
         server=${BASH_REMATCH[2]}
 


Mime
View raw message