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

Jump to bottom

Fix/stuck replication #459

Merged
merged 3 commits into from
Apr 2, 2018
Merged

Fix/stuck replication #459

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2bed3b
Un-hardcode mongodb database name
rachedbenmustapha Apr 2, 2018
6969998
Fix replication stream getting stuck
rachedbenmustapha Apr 2, 2018
91ccccf
Remove use of global variable
rachedbenmustapha Apr 2, 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
20 changes: 11 additions & 9 deletions lib/storage/metadata/mongoclient/LogConsumer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@ const stream = require('stream');
const MongoClient = require('mongodb').MongoClient;
const { Timestamp } = require('bson');

let lastEndID = null;

const ops = {
i: 'put',
u: 'put',
d: 'delete',
};

class ListRecordStream extends stream.Transform {
constructor(logger) {
constructor(logger, lastEndID) {
super({ objectMode: true });
this.logger = logger;
this.lastEndID = lastEndID;
this.hasStarted = false;
this.start = null;
this.end = null;
Expand Down Expand Up @@ -45,10 +44,9 @@ class ListRecordStream extends stream.Transform {

// only push to stream unpublished objects
if (!this.unpublishedListing) {
if (lastEndID === itemObj.h.toString()) {
if (this.lastEndID === itemObj.h.toString()) {
this.unpublishedListing = true;
}
return callback();
}

if (!this.hasStarted) {
Expand Down Expand Up @@ -105,11 +103,12 @@ class LogConsumer {
* @param {string} logger - logger
*/
constructor(mongoConfig, logger) {
const { replicaSetHosts } = mongoConfig;
const { replicaSetHosts, database } = mongoConfig;
// 'local' is the database where MongoDB has oplogs.rs capped collection
this.database = 'local';
this.mongoUrl = `mongodb://${replicaSetHosts}/local`;
this.logger = logger;
this.metadataDatabase = database;
}

/**
Expand Down Expand Up @@ -150,15 +149,18 @@ class LogConsumer {
* @return {undefined}
*/
readRecords(params, cb) {
const recordStream = new ListRecordStream(this.logger);
const limit = params.limit || 10000;
const startIDandSeq = params.startSeq.toString().split('|');
const startSeq = parseInt(startIDandSeq[0], 10) || 0;
lastEndID = startIDandSeq[1];
const lastEndID = startIDandSeq[1];
Copy link
Contributor

@alexanderchan-scality alexanderchan-scality Apr 2, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this change the this.lastEndID? just wondering, in the the old code, the global lastEndID is reassigned.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are in 2 separate classes, and the global was removed.

const recordStream = new ListRecordStream(this.logger, lastEndID);

const db = this.metadataDatabase;
const ns = new RegExp(`^(?!.*${db}.*(?:__)).*${db}\\.\\w+.*`);

this.coll = this.db.collection('oplog.rs');
return this.coll.find({
ns: /^(?!.*metadata.*(?:__)).*metadata\.\w+.*/,
ns,
ts: { $gte: Timestamp.fromNumber(startSeq) },
}, {
limit,
Expand Down