SERVER-48384 Make PeriodicJob stop before TimestampMonitor destroy its members

1 files changed, 4 insertions, 2 deletions

diff --git a/src/mongo/db/storage/storage_engine_impl.h b/src/mongo/db/storage/storage_engine_impl.h
index 99ef111f70f..7110af07951 100644
--- a/src/mongo/db/storage/storage_engine_impl.h
+++ b/src/mongo/db/storage/storage_engine_impl.h
@@ -283,11 +283,13 @@ public:
 
         KVEngine* _engine;
         bool _running;
-        PeriodicJobAnchor _job;
 
         // The set of timestamps that were last reported to the listeners by the monitor.
         MonitoredTimestamps _currentTimestamps;
 
+        // Periodic runner that the timestamp monitor schedules its job on.
+        PeriodicRunner* _periodicRunner;
+
         // Protects access to _listeners below.
         Mutex _monitorMutex = MONGO_MAKE_LATCH("TimestampMonitor::_monitorMutex");
         std::vector<TimestampListener*> _listeners;
@@ -297,7 +299,7 @@ public:
         // when the class instance is being deconstructed. This causes the PeriodicJobAnchor to stop
         // the PeriodicJob, preventing us from accessing any destructed variables if this were to
         // run during the destruction of this class instance.
-        PeriodicRunner* _periodicRunner;
+        PeriodicJobAnchor _job;
     };
 
     StorageEngine* getStorageEngine() override {