Skip to content
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

Fix ConsumerGroup uncaught exceptions #505

Merged
merged 2 commits into from
Nov 3, 2016
Merged

Fix ConsumerGroup uncaught exceptions #505

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
8613e07
Fixes #504 uncaught exception trying to write to a destroyed socket
hyperlink Nov 2, 2016
e23d92a
catch errors emitted from Offset
hyperlink Nov 2, 2016
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
7 changes: 3 additions & 4 deletions lib/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ Client.prototype.sendGroupRequest = function (encode, decode, requestArgs) {
var request = encode.apply(null, requestArgs);
var broker = this.brokerForLeader(this.coordinatorId);

if (!broker || !broker.socket || broker.socket.error) {
if (!broker || !broker.socket || broker.socket.error || broker.socket.destroyed) {
return cb(new errors.BrokerNotAvailableError('Broker not available'));
}

Expand Down Expand Up @@ -342,7 +342,7 @@ Client.prototype.loadMetadataForTopics = function (topics, cb) {
var request = protocol.encodeMetadataRequest(this.clientId, correlationId, topics);
var broker = this.brokerForLeader();

if (!broker || !broker.socket || broker.socket.error) {
if (!broker || !broker.socket || broker.socket.error || broker.socket.destroyed) {
return cb(new errors.BrokerNotAvailableError('Broker not available'));
}

Expand Down Expand Up @@ -534,7 +534,7 @@ Client.prototype.sendToBroker = function (payloads, encoder, decoder, cb) {
var correlationId = this.nextId();
var request = encoder(this.clientId, correlationId, payloads[leader]);
var broker = this.brokerForLeader(leader, longpolling);
if (!broker || !broker.socket || broker.socket.error || broker.socket.closing) {
if (!broker || !broker.socket || broker.socket.error || broker.socket.closing || broker.socket.destroyed) {
return cb(new errors.BrokerNotAvailableError('Could not find the leader'), payloads[leader]);
}

Expand Down Expand Up @@ -613,7 +613,6 @@ Client.prototype.brokerForLeader = function (leader, longpolling) {
} else if (!_.isEmpty(this.brokerMetadata)) {
leader = Object.keys(this.brokerMetadata)[0];
} else {
this.emit('error', new errors.BrokerNotAvailableError('Could not find a broker'));
return;
}
}
Expand Down
4 changes: 4 additions & 0 deletions lib/consumerGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const debug = require('debug')('kafka-node:ConsumerGroup');
const util = require('util');
const EventEmitter = require('events');
const highLevelConsumer = require('./highLevelConsumer');
const Client = require('./client');
const Offset = require('./offset');
Expand Down Expand Up @@ -46,6 +47,7 @@ const DEFAULTS = {
};

function ConsumerGroup (memberOptions, topics) {
EventEmitter.call(this);
const self = this;
this.options = _.defaults((memberOptions || {}), DEFAULTS);

Expand Down Expand Up @@ -289,6 +291,8 @@ ConsumerGroup.prototype.getOffset = function () {
return this.offset;
}
this.offset = new Offset(this.client);
// we can ignore this since we are already forwarding error event emitted from client
this.offset.on('error', _.noop);
return this.offset;
};

Expand Down