MB-33900: Correct allocator context for ExecutorPool::shutdown

Use the NonBucketAllocationGuard in ExecutorPool::shutdown to
match the allocation in ::get()

Change-Id: Ica550695d43c5c3b5d11f7b78c81404985ca967b
Reviewed-on: http://review.couchbase.org/108145
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: jimwwalker

engines/ep/src/executorpool.cc

@@ -130,15 +130,13 @@ ExecutorPool *ExecutorPool::get(void) {
 
             Configuration &config =
                 ObjectRegistry::getCurrentEngine()->getConfiguration();
-            EventuallyPersistentEngine *epe =
-                                   ObjectRegistry::onSwitchThread(NULL, true);
+            NonBucketAllocationGuard guard;
             tmp = new ExecutorPool(config.getMaxThreads(),
                                    NUM_TASK_GROUPS,
                                    config.getNumReaderThreads(),
                                    config.getNumWriterThreads(),
                                    config.getNumAuxioThreads(),
                                    config.getNumNonioThreads());
-            ObjectRegistry::onSwitchThread(epe);
             instance.store(tmp);
         }
     }
@@ -149,6 +147,7 @@ void ExecutorPool::shutdown(void) {
     std::lock_guard<std::mutex> lock(initGuard);
     auto* tmp = instance.load();
     if (tmp != nullptr) {
+        NonBucketAllocationGuard guard;
         delete tmp;
         instance = nullptr;
     }