wsrep_sst scripts: support traditional netcat

MariaDB · Mar 22, 2018 · a15ab35 · a15ab35
1 parent 89b0d5c
commit a15ab35
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 7 deletions.
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh
@@ -179,12 +179,26 @@ get_transfer()
         wsrep_log_info "Using netcat as streamer"
         if [[ "$WSREP_SST_OPT_ROLE"  == "joiner" ]];then
             if nc -h 2>&1 | grep -q ncat;then 
+                # Ncat
                 tcmd="nc -l ${TSST_PORT}"
-            else 
+            elif nc -h 2>&1 | grep -q -- '-d\>';then
+                # Debian netcat
                 tcmd="nc -dl ${TSST_PORT}"
+            else
+                # traditional netcat
+                tcmd="nc -l -p ${TSST_PORT}"
             fi
         else
-            tcmd="nc ${REMOTEIP} ${TSST_PORT}"
+            if nc -h 2>&1 | grep -q ncat;then
+                # Ncat
+                tcmd="nc ${REMOTEIP} ${TSST_PORT}"
+            elif nc -h 2>&1 | grep -q -- '-d\>';then
+                # Debian netcat
+                tcmd="nc ${REMOTEIP} ${TSST_PORT}"
+            else
+                # traditional netcat
+                tcmd="nc -q0 ${REMOTEIP} ${TSST_PORT}"
+            fi
         fi
     else
         tfmt='socat'

diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh
@@ -268,13 +268,26 @@ get_transfer()
         wsrep_log_info "Using netcat as streamer"
         if [[ "$WSREP_SST_OPT_ROLE"  == "joiner" ]];then
             if nc -h 2>&1 | grep -q ncat; then
+                # Ncat
                 tcmd="nc $sockopt -l ${TSST_PORT}"
-            else 
+            elif nc -h 2>&1 | grep -q -- '-d\>';then
+                # Debian netcat
                 tcmd="nc $sockopt -dl ${TSST_PORT}"
+            else
+                # traditional netcat
+                tcmd="nc $sockopt -l -p ${TSST_PORT}"
             fi
         else
-            # netcat doesn't understand [] around IPv6 address
-            tcmd="nc ${WSREP_SST_OPT_HOST_UNESCAPED} ${TSST_PORT}"
+            if nc -h 2>&1 | grep -q ncat;then
+                # Ncat
+                tcmd="nc ${WSREP_SST_OPT_HOST_UNESCAPED} ${TSST_PORT}"
+            elif nc -h 2>&1 | grep -q -- '-d\>';then
+                # Debian netcat
+                tcmd="nc ${WSREP_SST_OPT_HOST_UNESCAPED} ${TSST_PORT}"
+            else
+                # traditional netcat
+                tcmd="nc -q0 ${WSREP_SST_OPT_HOST_UNESCAPED} ${TSST_PORT}"
+            fi
         fi
     else
         tfmt='socat'

diff --git a/scripts/wsrep_sst_xtrabackup.sh b/scripts/wsrep_sst_xtrabackup.sh
@@ -144,12 +144,26 @@ get_transfer()
         wsrep_log_info "Using netcat as streamer"
         if [[ "$WSREP_SST_OPT_ROLE"  == "joiner" ]];then
             if nc -h 2>&1 | grep -q ncat;then 
+                # Ncat
                 tcmd="nc -l ${TSST_PORT}"
-            else 
+            elif nc -h 2>&1 | grep -q -- '-d\>';then
+                # Debian netcat
                 tcmd="nc -dl ${TSST_PORT}"
+            else
+                # traditional netcat
+                tcmd="nc -l -p ${TSST_PORT}"
             fi
         else
-            tcmd="nc ${WSREP_SST_OPT_HOST_UNESCAPED} ${TSST_PORT}"
+            if nc -h 2>&1 | grep -q ncat;then
+                # Ncat
+                tcmd="nc ${REMOTEIP} ${TSST_PORT}"
+            elif nc -h 2>&1 | grep -q -- '-d\>';then
+                # Debian netcat
+                tcmd="nc ${REMOTEIP} ${TSST_PORT}"
+            else
+                # traditional netcat
+                tcmd="nc -q0 ${REMOTEIP} ${TSST_PORT}"
+            fi
         fi
     else
         tfmt='socat'