From 7f2d10f626b179e7215e64ce5b82aa5863a1e9bd Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Sun, 7 Dec 2014 05:05:23 +0000 Subject: [PATCH 1/2] avoid hard coding the postgres username --- lib/adm.js | 9 +++++---- lib/shard.js | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/adm.js b/lib/adm.js index 3e15d48..309a2b5 100644 --- a/lib/adm.js +++ b/lib/adm.js @@ -284,7 +284,7 @@ function clear(opts, cb) { */ function rebuild(opts, cb) { var config = opts.config; - var pgUrl = 'tcp://postgres@' + config.ip + ':' + config.postgresPort + + var pgUrl = 'tcp://' + config.postgresMgrCfg.dbUser + '@' + config.ip + ':' + config.postgresPort + '/postgres'; var dataset = config.postgresMgrCfg.zfsClientCfg.dataset; var shard = path.basename(config.shardPath); @@ -651,7 +651,7 @@ function promote(opts, cb) { var config = opts.config; var cookie = config.postgresMgrCfg.syncStateCheckerCfg.cookieLocation; var shard = path.basename(config.shardPath); - var pgUrl = 'tcp://postgres@' + config.ip + ':' + config.postgresPort + + var pgUrl = 'tcp://' + config.postgresMgrCfg.dbUser + '@' + config.ip + ':' + config.postgresPort + '/postgres'; vasync.pipeline({funcs: [ @@ -974,7 +974,8 @@ function transformBackupUrl(zkNode) { * @return {string} The transformed pg url, e.g. * tcp://postgres@10.0.0.0:5432/postgres */ -function transformPgUrl(zkNode) { +function transformPgUrl(opts, zkNode) { + var config = opts.config; var data = zkNode.split('-')[0].split(':'); - return 'tcp://postgres@' + data[0] + ':' + data[1] + '/postgres'; + return 'tcp://' + config.postgresMgrCfg.dbUser + '@' + data[0] + ':' + data[1] + '/postgres'; } diff --git a/lib/shard.js b/lib/shard.js index a6d24c6..0b40bc8 100644 --- a/lib/shard.js +++ b/lib/shard.js @@ -416,7 +416,7 @@ Shard.prototype.TRANSITION_FUNCS = { var self = ctx.self; var log = self._log; var myLeader = ctx.leader; - var pgUrl = self._transformPgUrl(myLeader); + var pgUrl = self._transformPgUrl(myLeader, self._postgresMgr._dbUser); var backupUrl = self._transformBackupUrl(myLeader); self._leader = pgUrl; var postgresMgr = self._postgresMgr; @@ -540,7 +540,7 @@ Shard.prototype.TRANSITION_FUNCS = { var self = ctx.self; var log = self._log; var postgresMgr = self._postgresMgr; - var standbyUrl = self._transformPgUrl(ctx.standby); + var standbyUrl = self._transformPgUrl(ctx.standby, self._postgresMgr._dbUser); self._currStandby = standbyUrl; log.info({standby: standbyUrl}, 'Shard.NEW_STANDBY: entering'); @@ -1744,9 +1744,9 @@ Shard.prototype._writeRegistrar = function (callback) { * @return {string} The transformed pg url, e.g. * tcp://postgres@10.0.0.0:5432/postgres */ -Shard.prototype._transformPgUrl = function (zkNode) { +Shard.prototype._transformPgUrl = function (zkNode,dbUser) { var data = zkNode.split('-')[0].split(':'); - return 'tcp://postgres@' + data[0] + ':' + data[1] + '/postgres'; + return 'tcp://' + dbUser + '@' + data[0] + ':' + data[1] + '/postgres'; }; /** From 92916940faa102158ee02e07bf62486c68b582bb Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Thu, 11 Dec 2014 21:06:40 +0000 Subject: [PATCH 2/2] fix style issues --- lib/adm.js | 11 ++++++----- lib/shard.js | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/adm.js b/lib/adm.js index 309a2b5..da00ae3 100644 --- a/lib/adm.js +++ b/lib/adm.js @@ -284,8 +284,8 @@ function clear(opts, cb) { */ function rebuild(opts, cb) { var config = opts.config; - var pgUrl = 'tcp://' + config.postgresMgrCfg.dbUser + '@' + config.ip + ':' + config.postgresPort + - '/postgres'; + var pgUrl = 'tcp://' + config.postgresMgrCfg.dbUser + '@' + config.ip + + ':' + config.postgresPort + '/postgres'; var dataset = config.postgresMgrCfg.zfsClientCfg.dataset; var shard = path.basename(config.shardPath); @@ -651,8 +651,8 @@ function promote(opts, cb) { var config = opts.config; var cookie = config.postgresMgrCfg.syncStateCheckerCfg.cookieLocation; var shard = path.basename(config.shardPath); - var pgUrl = 'tcp://' + config.postgresMgrCfg.dbUser + '@' + config.ip + ':' + config.postgresPort + - '/postgres'; + var pgUrl = 'tcp://' + config.postgresMgrCfg.dbUser + '@' + config.ip + + ':' + config.postgresPort + '/postgres'; vasync.pipeline({funcs: [ function _getShardStatus(_, _cb) { @@ -977,5 +977,6 @@ function transformBackupUrl(zkNode) { function transformPgUrl(opts, zkNode) { var config = opts.config; var data = zkNode.split('-')[0].split(':'); - return 'tcp://' + config.postgresMgrCfg.dbUser + '@' + data[0] + ':' + data[1] + '/postgres'; + return 'tcp://' + config.postgresMgrCfg.dbUser + '@' + data[0] + ':' + + data[1] + '/postgres'; } diff --git a/lib/shard.js b/lib/shard.js index 0b40bc8..0645e7e 100644 --- a/lib/shard.js +++ b/lib/shard.js @@ -540,7 +540,8 @@ Shard.prototype.TRANSITION_FUNCS = { var self = ctx.self; var log = self._log; var postgresMgr = self._postgresMgr; - var standbyUrl = self._transformPgUrl(ctx.standby, self._postgresMgr._dbUser); + var standbyUrl = self._transformPgUrl(ctx.standby, + self._postgresMgr._dbUser); self._currStandby = standbyUrl; log.info({standby: standbyUrl}, 'Shard.NEW_STANDBY: entering'); @@ -1744,7 +1745,7 @@ Shard.prototype._writeRegistrar = function (callback) { * @return {string} The transformed pg url, e.g. * tcp://postgres@10.0.0.0:5432/postgres */ -Shard.prototype._transformPgUrl = function (zkNode,dbUser) { +Shard.prototype._transformPgUrl = function (zkNode, dbUser) { var data = zkNode.split('-')[0].split(':'); return 'tcp://' + dbUser + '@' + data[0] + ':' + data[1] + '/postgres'; };