Permalink
Browse files

Merge remote branch 'origin/bwf-sink_died'

  • Loading branch information...
2 parents fe6ddb0 + 972cf80 commit a247c85040e5bf429e7923907579387625e09a84 Bryan Fink committed Jun 4, 2012
Showing with 4 additions and 8 deletions.
  1. +4 −8 src/riak_pipe_builder.erl
View
@@ -199,14 +199,10 @@ handle_info({'DOWN', Ref, process, Pid, Reason}, StateName,
%% the sink died - kill the pipe, since it has
%% nowhere to send its output
- %% There is a slight chance that a sink that
- %% handles 'eoi' extremely efficiently could cause
- %% this 'DOWN' to arrive before the final fitting
- %% 'DOWN', but there is no chance of data loss in
- %% that case, only a misleading error
- %% message. Reason is included in an attempt to
- %% make the error message less misleading.
- {stop, {sink_died, Reason}, State};
+ %% Exit normal here because an abnormal sink exit
+ %% should have generated its own error log, and a
+ %% normal sink exit should not generate spam.
+ {stop, normal, State};
true ->
%% this wasn't meant for us - ignore
{next_state, StateName, State}

0 comments on commit a247c85

Please sign in to comment.