Skip to content

Fix for stuck consumer if item is ignored #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 1, 2017
Merged

Fix for stuck consumer if item is ignored #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8a432b
Fixed consumer getting stuck in acquire() after item is explicitly ig…
davydovmax Sep 19, 2017
0644a2f
Added test case for infinite loop in acquire() after item is explicit…
davydovmax Sep 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/Data/Consumer/MySQL2.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,10 @@ sub acquire {
$self->debug_warn( 5, "last_id was $self->{last_id}");
my ($id)= $dbh->selectrow_array( $self->{select_sql}, undef, $self->{last_id}, @{ $self->{select_args} || [] } );
if ( defined $id ) {
next if $self->is_ignored($id);
if ( $self->is_ignored($id) ) {
$self->{last_id}= $id;
next;
}
my ($got_id) = $dbh->selectrow_array( $self->{check_sql}, undef, $id, @{ $self->{check_args} || [] } );
if ( not defined $got_id) {
$self->debug_warn(5, "race condition avoided for '$id', check_sql and select_sql did not line up!");
Expand Down
6 changes: 6 additions & 0 deletions t/01-mysql.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use DBI;
my $debug = @ARGV ? shift : $ENV{TEST_DEBUG};
our @fake_error;
our @expect_fail;
our %ignored;
our %process_state;
our @connect_args;
our $table;
Expand Down Expand Up @@ -122,6 +123,11 @@ $consumer->consume(sub {
my ($consumer,$id,$dbh) = @_;
$debug and $consumer->debug_warn(0,"*** processing '$id'");
$debug and $consumer->debug_warn(0,$id,Dumper($dbh->selectrow_arrayref("select IS_USED_LOCK(CONCAT_WS('=','$0-$table',$id))")));
if($ignored{$id}) {
$debug and $consumer->debug_warn(0,"* ignoring '$id' as requested\n");
$consumer->ignore();
return;
}
sleep(1);
$dbh->do("UPDATE `$table` SET `n` = `n` + 1 WHERE `id` = ?", undef, $id);

Expand Down
26 changes: 26 additions & 0 deletions t/07-mysql-ignore.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
use strict;
use warnings;
use Cwd;
our %process_state = (
unprocessed => 94,
processed => 10,
working => 123,
failed => 666,
);

our $object='Data::Consumer';
our @expect_fail=([3,0,94]);
our %ignored=(3=>1);

%ignored = %ignored; #silence warnings on 5.6.2
@expect_fail = @expect_fail; #silence warnings on 5.6.2
$object = $object; #silence warnings on 5.6.2
%process_state = %process_state; # silence warnings on 5.6.2

my $file='t/01-mysql.t';
my $res = do $file;
if (!defined $res) {
die "Error executing '$file': ",$@||$!,"\nCwd=". cwd(),"\n";
}