diff options
author | Eric Milkie <milkie@10gen.com> | 2012-10-03 11:49:45 -0400 |
---|---|---|
committer | Eric Milkie <milkie@10gen.com> | 2012-10-04 10:53:10 -0400 |
commit | 8e660532455d1165ff039068336c3dcb1cd5ad5f (patch) | |
tree | 6286f40dec5f68adea43080f3369a6a797a60e26 | |
parent | ee081e1df9792e6435568b16d4710a9443ca3657 (diff) | |
download | mongo-8e660532455d1165ff039068336c3dcb1cd5ad5f.tar.gz |
SERVER-6671 split lines for easier debugging
-rw-r--r-- | src/mongo/db/oplog.cpp | 6 | ||||
-rw-r--r-- | src/mongo/db/repl/rs.h | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/mongo/db/oplog.cpp b/src/mongo/db/oplog.cpp index fc5678badde..3af9ec7eb74 100644 --- a/src/mongo/db/oplog.cpp +++ b/src/mongo/db/oplog.cpp @@ -125,7 +125,7 @@ namespace mongo { } /* we write to local.oplog.rs: - { ts : ..., h: ..., v: ..., op: ..., ns: ..., o: ... } + { ts : ..., h: ..., v: ..., op: ..., etc } ts: an OpTime timestamp h: hash v: version @@ -136,8 +136,8 @@ namespace mongo { "c" db cmd "db" declares presence of a database (ns is set to the db name + '.') "n" no op - logNS: always null! DEPRECATED - bb: + + bb param: if not null, specifies a boolean to pass along to the other side as b: param. used for "justOne" or "upsert" flags on 'd', 'u' diff --git a/src/mongo/db/repl/rs.h b/src/mongo/db/repl/rs.h index 019fc64965f..5bd41d11311 100644 --- a/src/mongo/db/repl/rs.h +++ b/src/mongo/db/repl/rs.h @@ -674,8 +674,12 @@ namespace mongo { } inline bool ignoreUniqueIndex(IndexDetails& idx) { - if (!idx.unique()) return false; - if (!theReplSet) return false; + if (!idx.unique()) { + return false; + } + if (!theReplSet) { + return false; + } // see SERVER-6671 MemberState ms = theReplSet->state(); if (! ((ms == MemberState::RS_STARTUP2) || @@ -685,9 +689,13 @@ namespace mongo { } // 2 is the oldest oplog version where operations // are fully idempotent. - if (theReplSet->oplogVersion < 2) return false; + if (theReplSet->oplogVersion < 2) { + return false; + } // Never ignore _id index - if (idx.isIdIndex()) return false; + if (idx.isIdIndex()) { + return false; + } return true; } |