From d0cd37a4e24a1aa3859409fbb87f0248264040e6 Mon Sep 17 00:00:00 2001 From: Scott Hernandez Date: Tue, 9 Feb 2016 15:36:59 -0500 Subject: SERVER-22533: disable ReadConcern.Majority tests for noJournal variant --- etc/evergreen.yml | 2 +- jstests/replsets/read_committed.js | 2 ++ jstests/replsets/read_committed_no_snapshots.js | 2 ++ jstests/replsets/read_committed_on_secondary.js | 2 ++ jstests/replsets/read_majority_two_arbs.js | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 6eea1742d28..667cd98ecd0 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -2464,7 +2464,7 @@ buildvariants: push_arch: x86_64 compile_flags: -j$(grep -c ^processor /proc/cpuinfo) CC=/opt/mongodbtoolchain/bin/gcc CXX=/opt/mongodbtoolchain/bin/g++ num_jobs_available: $(grep -c ^processor /proc/cpuinfo) - test_flags: --nojournal + test_flags: --nojournal --excludeWithAnyTags=requires_journaling tasks: - name: compile distros: diff --git a/jstests/replsets/read_committed.js b/jstests/replsets/read_committed.js index 06776edcce1..2ed51300534 100644 --- a/jstests/replsets/read_committed.js +++ b/jstests/replsets/read_committed.js @@ -1,4 +1,6 @@ /** + * @tags: [requires_journaling] + * * Test basic read committed functionality, including: * - Writes with writeConcern 'majority' should be visible once the write completes. * - With the only data-bearing secondary down, committed reads should not include newly inserted diff --git a/jstests/replsets/read_committed_no_snapshots.js b/jstests/replsets/read_committed_no_snapshots.js index 60b5d7d9ca0..2abf15beb2d 100644 --- a/jstests/replsets/read_committed_no_snapshots.js +++ b/jstests/replsets/read_committed_no_snapshots.js @@ -1,4 +1,6 @@ /** + * @tags: [requires_journaling] + * * Test basic read committed maxTimeMS timeout while waiting for a committed snapshot: * - Reads with an 'afterOpTime' snapshot >= current time should be able to see things that * happened before or at that opTime. diff --git a/jstests/replsets/read_committed_on_secondary.js b/jstests/replsets/read_committed_on_secondary.js index 1adf9dffae6..207b1e0373c 100644 --- a/jstests/replsets/read_committed_on_secondary.js +++ b/jstests/replsets/read_committed_on_secondary.js @@ -1,4 +1,6 @@ /** + * @tags: [requires_journaling] + * * Test basic read committed functionality on a secondary: * - Updates should not be visible until they are in the blessed snapshot. * - Updates should be visible once they are in the blessed snapshot. diff --git a/jstests/replsets/read_majority_two_arbs.js b/jstests/replsets/read_majority_two_arbs.js index 824b733eaba..b280a0c0ad4 100644 --- a/jstests/replsets/read_majority_two_arbs.js +++ b/jstests/replsets/read_majority_two_arbs.js @@ -1,4 +1,6 @@ /** + * @tags: [requires_journaling] + * * Tests that writeConcern 'majority' writes succeed and are visible in a replica set that has one * data-bearing node and two arbiters. */ -- cgit v1.2.1