Skip to content

Improved logging and Replica set compatibility #1097

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
Feb 1, 2018
Merged

Improved logging and Replica set compatibility #1097

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
24ae398
Replica Set Compatibility
Jan 10, 2018
d195267
Improved Mongo Loggging
Feb 1, 2018
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
11 changes: 7 additions & 4 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,11 @@
"recordLogName": "s3-recordlog"
},
"mongodb": {
"host": "localhost",
"port": 27018,
"database": "metadata"
"host": "localhost",
"port": 27018,
"writeConcern": "majority",
"replicaSet": "",
"readPreference": "primary",
"database": "metadata"
}
}
}
13 changes: 13 additions & 0 deletions docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,19 @@ if [[ "$METADATA_HOST" ]]; then
JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .metadataClient.host=\"$METADATA_HOST\""
fi

if [[ "$MONGODB_HOST" ]]; then
JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .mongodb.host=\"$MONGODB_HOST\""
JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .mongodb.port=27017"
fi

if [[ "$MONGODB_PORT" ]]; then
JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .mongodb.port=$MONGODB_PORT"
fi

if [[ "$MONGODB_RS" ]]; then
JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .mongodb.replicaSet=\"$MONGODB_RS\""
fi

if [[ "$REDIS_HOST" ]]; then
JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .localCache.host=\"$REDIS_HOST\""
JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .localCache.port=6379"
Expand Down
83 changes: 76 additions & 7 deletions lib/metadata/mongoclient/backend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ const ASYNC_REPAIR_TIMEOUT = 15000;
let uidCounter = 0;

const VID_SEP = versioning.VersioningConstants.VersionId.Separator;
const format = require('util').format;


function generateVersionId() {
// generate a unique number for each member of the nodejs cluster
Expand All @@ -65,9 +67,15 @@ function generatePHDVersion(versionId) {
}

class MongoClientInterface {

constructor() {
const mongoUrl =
`mongodb://${config.mongodb.host}:${config.mongodb.port}`;
const mongoUrl = format(
'mongodb://%s:%s/w=%s&replicaSet=%s&readPreference=%s',
config.mongodb.host,
config.mongodb.port,
config.mongodb.writeConcern,
config.mongodb.replicaSet,
config.mongodb.readPreference);
this.logger = logger;
this.client = null;
this.db = null;
Expand All @@ -77,6 +85,8 @@ class MongoClientInterface {
// initialize this backend
MongoClient.connect(mongoUrl, (err, client) => {
if (err) {
this.logger.error('error connecting to mongo server',
{ error: err.message });
throw (errors.InternalError);
}
this.logger.debug('connected to mongodb');
Expand Down Expand Up @@ -140,6 +150,9 @@ class MongoClientInterface {
_id: bucketName,
}, {}, (err, doc) => {
if (err) {
log.error(
'getBucketAttributes: error getting bucket attributes',
{ error: err.message });
return cb(errors.InternalError);
}
if (!doc) {
Expand All @@ -156,6 +169,9 @@ class MongoClientInterface {
getBucketAndObject(bucketName, objName, params, log, cb) {
this.getBucketAttributes(bucketName, log, (err, bucket) => {
if (err) {
log.error(
'getBucketAttributes: error getting bucket attributes',
{ error: err.message });
return cb(err);
}
this.getObject(bucketName, objName, params, log, (err, obj) => {
Expand All @@ -166,6 +182,8 @@ class MongoClientInterface {
BucketInfo.fromObj(bucket).serialize(),
});
}
log.error('getObject: error getting object',
{ error: err.message });
return cb(err);
}
return cb(null, {
Expand Down Expand Up @@ -203,9 +221,13 @@ class MongoClientInterface {
_id: bucketName,
}, {}, (err, result) => {
if (err) {
log.error('deleteBucketStep2: error deleting bucket',
{ error: err.message });
return cb(errors.InternalError);
}
if (result.ok !== 1) {
log.error('deleteBucketStep2: failed deleting bucket',
{ error: err.message });
return cb(errors.InternalError);
}
return cb(null);
Expand All @@ -229,6 +251,8 @@ class MongoClientInterface {
if (err.codeName === 'NamespaceNotFound') {
return this.deleteBucketStep2(bucketName, log, cb);
}
log.error('deleteBucket: error deleting bucket',
{ error: err.message });
return cb(errors.InternalError);
}
return this.deleteBucketStep2(bucketName, log, cb);
Expand Down Expand Up @@ -334,7 +358,15 @@ class MongoClientInterface {
value: objVal,
}, {
upsert: true,
}, () => cb());
}, err => {
if (err) {
log.error(
'putObjectNoVer: error putting obect with no versioning',
{ error: err.message });
return cb(errors.InternalError);
}
return cb();
});
}

putObject(bucketName, objName, objVal, params, log, cb) {
Expand Down Expand Up @@ -364,6 +396,8 @@ class MongoClientInterface {
_id: objName,
}, {}, (err, doc) => {
if (err) {
log.error('findOne: error getting object',
{ error: err.message });
return cb(errors.InternalError);
}
if (!doc) {
Expand All @@ -372,7 +406,8 @@ class MongoClientInterface {
if (doc.value.isPHD) {
this.getLatestVersion(c, objName, log, (err, value) => {
if (err) {
log.error('getting latest version', err);
log.error('getLatestVersion: getting latest version',
{ error: err.message });
return cb(err);
}
return cb(null, value);
Expand Down Expand Up @@ -401,6 +436,9 @@ class MongoClientInterface {
toArray(
(err, keys) => {
if (err) {
log.error(
'getLatestVersion: error getting latest version',
{ error: err.message });
return cb(errors.InternalError);
}
if (keys.length === 0) {
Expand Down Expand Up @@ -430,9 +468,13 @@ class MongoClientInterface {
upsert: true,
}, (err, result) => {
if (err) {
log.error('repair: error trying to repair value',
{ error: err.message });
return cb(errors.InternalError);
}
if (result.ok !== 1) {
log.error('repair: failed trying to repair value',
{ error: err.message });
return cb(errors.InternalError);
}
return cb(null);
Expand All @@ -446,12 +488,13 @@ class MongoClientInterface {
asyncRepair(c, objName, mst, log) {
this.getLatestVersion(c, objName, log, (err, value) => {
if (err) {
log.error('async-repair: getting latest version', err);
log.error('async-repair: getting latest version',
{ error: err.message });
return undefined;
}
this.repair(c, objName, value, mst, log, err => {
if (err) {
log.error('async-repair failed', err);
log.error('async-repair failed', { error: err.message });
return undefined;
}
log.debug('async-repair success');
Expand Down Expand Up @@ -482,6 +525,9 @@ class MongoClientInterface {
'value.versionId': mst.versionId,
}, {}, err => {
if (err) {
log.error(
'findOneAndDelete: error finding and deleting',
{ error: err.message });
return cb(errors.InternalError);
}
// do not test result.ok === 1 because
Expand All @@ -490,6 +536,8 @@ class MongoClientInterface {
});
return undefined;
}
log.error('getLatestVersion: error getting latest version',
{ error: err.message });
return cb(err);
}
// We have other versions available so repair:
Expand Down Expand Up @@ -542,9 +590,15 @@ class MongoClientInterface {
_id: vObjName,
}, {}, (err, result) => {
if (err) {
log.error(
'findOneAndDelete: error when version is not master',
{ error: err.message });
return cb(errors.InternalError);
}
if (result.ok !== 1) {
log.error(
'findOneAndDelete: failed when version is not master',
{ error: err.message });
return cb(errors.InternalError);
}
return cb(null);
Expand All @@ -562,6 +616,8 @@ class MongoClientInterface {
_id: objName,
}, {}, (err, mst) => {
if (err) {
log.error('deleteObjectVer: error deleting versioned object',
{ error: err.message });
return cb(errors.InternalError);
}
if (!mst) {
Expand All @@ -585,9 +641,15 @@ class MongoClientInterface {
_id: objName,
}, {}, (err, result) => {
if (err) {
log.error(
'deleteObjectNoVer: error deleting object with no version',
{ error: err.message });
return cb(errors.InternalError);
}
if (result.ok !== 1) {
log.error(
'deleteObjectNoVer: failed deleting object with no version',
{ error: err.message });
return cb(errors.InternalError);
}
return cb(null);
Expand Down Expand Up @@ -626,7 +688,8 @@ class MongoClientInterface {
error: err.message,
errorStack: err.stack,
};
log.error('error listing objects', logObj);
log.error(
'internalListObject: error listing objects', logObj);
cb(errors.InternalError);
}
})
Expand Down Expand Up @@ -654,6 +717,8 @@ class MongoClientInterface {
_id: __UUID,
}, {}, (err, doc) => {
if (err) {
log.error('readUUID: error reading UUID',
{ error: err.message });
return cb(errors.InternalError);
}
if (!doc) {
Expand All @@ -675,6 +740,8 @@ class MongoClientInterface {
// FIXME: define a KeyAlreadyExists error in Arsenal
return cb(errors.EntityAlreadyExists);
}
log.error('writeUUIDIfNotExists: error writing UUID',
{ error: err.message });
return cb(errors.InternalError);
}
// FIXME: shoud we check for result.ok === 1 ?
Expand All @@ -691,6 +758,8 @@ class MongoClientInterface {
this.writeUUIDIfNotExists(uuid, log, err => {
if (err) {
if (err === errors.InternalError) {
log.error('getUUID: error getting UUID',
{ error: err.message });
return cb(err);
}
return this.readUUID(log, cb);
Expand Down