pt-upgrade failed to group by fingerprint & reported wrong number of diffs as reason for report

This commit is contained in:
Frank Cizmich
2015-04-01 16:45:23 -03:00
parent 16a7ffa6f9
commit ade9a283d4
5 changed files with 112 additions and 16 deletions

View File

@@ -5858,7 +5858,7 @@ sub report_unreported_classes {
class => $class,
reasons => ["$reason, but hasn't been reported yet"],
);
$class = { reported => 1 };
$class->{reported} = 1;
};
if ( $EVAL_ERROR ) {
$success = 1;
@@ -5872,11 +5872,11 @@ sub report_unreported_classes {
sub report_if_ready {
my ($self, %args) = @_;
my $class = $args{class};
my $max_examples = $self->max_class_size;
my $max_examples = $self->max_examples;
my $max_class_size = $self->max_class_size;
my @report_reasons;
if ( scalar keys %{$class->{unique_queries}} >= $self->max_class_size ) {
if ( scalar keys %{$class->{unique_queries}} >= $max_class_size ) {
push @report_reasons, "it's full (--max-class-size)";
}
@@ -5888,15 +5888,15 @@ sub report_if_ready {
push @report_reasons, "there are $max_examples warning diffs";
}
if ( scalar @{$class->{row_diffs}} >= $self->max_examples ) {
if ( scalar @{$class->{row_diffs}} >= $max_examples ) {
push @report_reasons, "there are $max_examples row diffs";
}
if ( scalar @{$class->{errors}} >= $self->max_examples ) {
if ( scalar @{$class->{errors}} >= $max_examples ) {
push @report_reasons, "there are $max_examples query errors";
}
if ( scalar @{$class->{failures}} >= $self->max_examples ) {
if ( scalar @{$class->{failures}} >= $max_examples ) {
push @report_reasons, "there are $max_examples failed queries";
}
@@ -5906,7 +5906,7 @@ sub report_if_ready {
class => $class,
reasons => \@report_reasons,
);
$class = { reported => 1 };
$class->{reported} = 1;
}
return;
@@ -5917,6 +5917,11 @@ sub report_class {
my $class = $args{class};
my $reasons = $args{reasons};
if ( $class->{reported} ) {
PTDEBUG && _d('Class already reported');
return;
}
PTDEBUG && _d('Reporting class', $class->{id}, $class->{fingerprint});
$self->_print_class_header(