Merge lp:~percona-core/percona-xtradb-cluster/bug-1402166 into lp:percona-xtradb-cluster

Proposed by Raghavendra D Prabhu on 2015-01-04
Status: Work in progress
Proposed branch: lp:~percona-core/percona-xtradb-cluster/bug-1402166
Merge into: lp:percona-xtradb-cluster
Diff against target: 19 lines (+5/-2)
1 file modified
sql/wsrep_sst.cc (+5/-2)
To merge this branch: bzr merge lp:~percona-core/percona-xtradb-cluster/bug-1402166
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2015-01-04 Needs Fixing on 2015-01-29
Review via email: mp+245518@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Shouldn't the code be rewritten as follows:

    if (!tmp || proc.error())
    {
      WSREP_ERROR("Failed to read uuid:seqno from joiner script.");
      if (proc.error())
        err = proc.error();
    }
    else
    {
      err= sst_scan_uuid_seqno (out, &ret_uuid, &ret_seqno);
    }

review: Needs Information

Fixed.

Alexey Kopytov (akopytov) wrote :

1. if tmp == NULL, but proc.error() returns 0, you will overwrite 'err' with 0. Which is wrong.
2. the MySQL coding stile is 'var= val' (note the space after var)
3. please use my_strerror() instead of strerror().

review: Needs Fixing

This will be resubmitted with fixes for issue mentioned above, as a separate pull request. (which I will mention here).

Unmerged revisions

947. By Raghavendra D Prabhu on 2015-01-27

Refactored the code for more clarity

946. By Raghavendra D Prabhu on 2014-12-16

Bug#1402166 Fix typo

945. By Raghavendra D Prabhu on 2014-12-14

Bug#1402166 Check for proc.error() in wsrep_joiner_thread in case the SST script aborts

944. By Alexey Kopytov on 2014-12-09

Merged lp:~akopytov/percona-xtradb-cluster/bug1382797-5.6.

943. By Raghavendra D Prabhu on 2014-12-08

Fix the syntax

942. By Raghavendra D Prabhu on 2014-12-08

Update for backup locks

941. By Raghavendra D Prabhu on 2014-11-29

Update documentation

940. By Raghavendra D Prabhu on 2014-11-27

Bug#1396757 Exit early in case mysqld was killed prematurely

939. By Hrvoje Matijakovic on 2014-11-25

Merged lp:~hrvojem/percona-xtradb-cluster/rn-5.6.21-25.8

938. By Raghavendra D Prabhu on 2014-11-25

Bump the PERCONA_INNODB_VERSION version

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sql/wsrep_sst.cc'
2--- sql/wsrep_sst.cc 2015-01-20 11:34:18 +0000
3+++ sql/wsrep_sst.cc 2015-01-27 11:28:30 +0000
4@@ -409,10 +409,13 @@
5 proc.wait();
6 err= EINVAL;
7
8- if (!tmp)
9+ if (!tmp || proc.error())
10 {
11 WSREP_ERROR("Failed to read uuid:seqno from joiner script.");
12- if (proc.error()) err = proc.error();
13+ if ((err=proc.error()))
14+ {
15+ WSREP_ERROR("SST script aborted with error %d (%s)", err, strerror(err));
16+ }
17 }
18 else
19 {

Subscribers

People subscribed via source and target branches

to all changes: