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 PG client/request queue state management. #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix PG client/request queue state management. #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36665f9
Fix PG client/request queue state management.
AmlingPalantir Sep 30, 2015
9b49c43
Do not leak extra error handler(s).
AmlingPalantir Oct 6, 2015
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
50 changes: 27 additions & 23 deletions lib/postgresMgr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1629,19 +1629,26 @@ PostgresMgr.prototype._pgQueryKick = function () {

if (!self._pgClient) {
self._pgClient = new Client(self._url.href);
var selfClient = self._pgClient;
self._pgClient.once('error', function (err) {
log.error({err: err}, 'got pg client error');
self._pgClient.removeAllListeners();
if (self._pgRequestOutstanding !== null) {
self._pgQueryFini(err);
} else {
/* See _pgQueryFini(). */
self._pgClient = null;
if (self._pgClient !== selfClient) {
// Actually we've already been booted, or possibly even
// replaced (null check alone does not seem sufficient).
return;
}
self._pgClient = null;
});
self._pgClient.connect();
}

var pgClientErrorHandlerClient = self._pgClient; // ugh
var pgClientErrorHandler = function (err) {
log.error({err: err}, 'got pg client error (for request)');
self._pgQueryFini(rq, err);
};
self._pgClient.once('error', pgClientErrorHandler);

query = self._pgClient.query(queryStr);
result = null;
log.trace('querying', query);
Expand All @@ -1652,32 +1659,29 @@ PostgresMgr.prototype._pgQueryKick = function () {
});

query.once('error', function (err) {
/*
* It's conceivable in this case that we got a client error and already
* finished handling this request above. In that case, we ignore this
* second error.
*/
if (rq == self._pgRequestOutstanding) {
self._pgQueryFini(err);
} else {
log.debug({ 'err': err },
'got query error for non-outstanding request');
}
pgClientErrorHandlerClient.removeListener('error', pgClientErrorHandler);
self._pgQueryFini(rq, err);
});

query.once('end', function () {
assert.ok(rq == self._pgRequestOutstanding);
self._pgQueryFini(null, result);
pgClientErrorHandlerClient.removeListener('error', pgClientErrorHandler);
self._pgQueryFini(rq, null, result);
});
};

PostgresMgr.prototype._pgQueryFini = function (err, result) {
PostgresMgr.prototype._pgQueryFini = function (rq, err, result) {
var self = this;
var log = self._log;
var rq;

assert.ok(self._pgRequestOutstanding !== null);
rq = self._pgRequestOutstanding;
if (self._pgRequestOutstanding !== rq) {
// this request already finished in some way
if (err) {
log.warn({ 'err': err }, 'got [spurious] err');
} else {
log.trace('query [spuriously] ended!');
}
return;
}
self._pgRequestOutstanding = null;

if (err) {
Expand Down