From 1e123960e3d2c4d7738d9c53fdbc3c6cdceea552 Mon Sep 17 00:00:00 2001
From: Siyuan Zhou <siyuan.zhou@mongodb.com>
Date: Fri, 5 May 2017 17:58:36 -0400
Subject: SERVER-29100 Wait for the same journaling requirement in
 get_last_error.js

---
 jstests/gle/get_last_error.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'jstests/gle')

diff --git a/jstests/gle/get_last_error.js b/jstests/gle/get_last_error.js
index d3542520c27..6c8a7a0bba1 100644
--- a/jstests/gle/get_last_error.js
+++ b/jstests/gle/get_last_error.js
@@ -62,7 +62,9 @@ assert.eq(gle.wtime, null);
 assert.gte(gle.waited, 5);
 assert.eq(gle.wtimeout, true);
 
-gle = mdb.getLastErrorObj("majority", 50);
+// Wait with { j: false }. { w: "majority" } waits for journaling by default,
+// so we override the behavior to make it the same as the previous getLastError command.
+gle = mdb.getLastErrorObj("majority", 50, false);
 print('Trying w=majority, 50ms timeout.');
 printjson(gle);
 assert.eq(gle.ok, 1);
-- 
cgit v1.2.1