Uploaded image for project: 'MariaDB Server'
  1. MariaDB Server
  2. MDEV-14010

merge issue in wsrep_sst_xtrabackup-v2

    XMLWordPrintable

Details

    • Bug
    • Status: Closed (View Workflow)
    • Critical
    • Resolution: Fixed
    • 10.1.28, 10.2.9
    • 10.1.29
    • Galera SST
    • None

    Description

      This line really shouldn't belong where it is:

      https://github.com/MariaDB/server/blob/mariadb-10.1.28/scripts/wsrep_sst_xtrabackup-v2.sh#L361
      https://github.com/MariaDB/server/blob/mariadb-10.2.9/scripts/wsrep_sst_xtrabackup-v2.sh#L361

      This was spotted during troubleshooting of MDEV-10934 , and after patch below the error gone:

      --- /home/a/mariadb-environs/_depot/m-tar/10.1.28/bin/wsrep_sst_xtrabackup-v2	2017-09-27 14:30:44.000000000 +0200
      +++ _depot/m-tar/10.1.28/bin/wsrep_sst_xtrabackup-v2	2017-10-05 14:33:09.891682811 +0200
      @@ -358,8 +358,7 @@
                   if [[ "$WSREP_SST_OPT_ROLE"  == "joiner" ]];then
                       wsrep_log_info "Decrypting with CERT: $tcert, KEY: $tkey"
                       tcmd="socat -u openssl-listen:${TSST_PORT},reuseaddr,cert=${tcert},key=${tkey},verify=0${joiner_extra}${sockopt} stdio"
      -                    tcmd="socat -u openssl-listen:${TSST_PORT},reuseaddr,cert=${tpem},key=${tkey},verify=0${sockopt} stdio"
      -                else
      +            else
                       wsrep_log_info "Encrypting with CERT: $tcert, KEY: $tkey"
                       tcmd="socat -u stdio openssl-connect:${REMOTEIP}:${TSST_PORT},cert=${tcert},key=${tkey},verify=0${sockopt}"
                   fi
      

      Note that variable `tpem` used in removed line - isn't really referenced anywhere else in the script.

      Attachments

        Issue Links

          Activity

            People

              anikitin Andrii Nikitin (Inactive)
              anikitin Andrii Nikitin (Inactive)
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Git Integration

                  Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.