SERVER-28495 FTDC for MongoS

(cherry picked from commit 02c46a3d4b270530335f542ad2926c50f1ba1b1f)

1 files changed, 2 insertions, 24 deletions

diff --git a/jstests/core/diagdata.js b/jstests/core/diagdata.js
index 490e4a3eb2b..6938f8c5102 100644
--- a/jstests/core/diagdata.js
+++ b/jstests/core/diagdata.js
@@ -1,4 +1,5 @@
 // Test that verifies getDiagnosticData returns FTDC data
+load('jstests/libs/ftdc.js');
 
 (function() {
     "use strict";
@@ -6,28 +7,5 @@
     // Verify we require admin database
     assert.commandFailed(db.diagdata.runCommand("getDiagnosticData"));
 
-    // We need to retry a few times if run this test immediately after mongod is started as FTDC may
-    // not have run yet.
-    var foundGoodDocument = false;
-
-    for (var i = 0; i < 60; ++i) {
-        var result = db.adminCommand("getDiagnosticData");
-        assert.commandWorked(result);
-
-        var data = result.data;
-
-        if (!data.hasOwnProperty("start")) {
-            // Wait a little longer for FTDC to start
-            sleep(500);
-        } else {
-            // Check for a few common properties to ensure we got data
-            assert(data.hasOwnProperty("serverStatus"),
-                   "does not have 'serverStatus' in '" + tojson(data) + "'");
-            assert(data.hasOwnProperty("end"), "does not have 'end' in '" + tojson(data) + "'");
-            foundGoodDocument = true;
-        }
-    }
-    assert(foundGoodDocument,
-           "getDiagnosticData failed to return a non-empty command, is FTDC running?");
-
+    verifyGetDiagnosticData(db.getSiblingDB('admin'));
 })();