Changed to use wise_01 database.

lsst · Jun 11, 2021 · 0356e4f · 0356e4f
1 parent a827fcc
commit 0356e4f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/core/modules/ccontrol/UserQuerySelect.cc b/core/modules/ccontrol/UserQuerySelect.cc
@@ -78,6 +78,7 @@
 #include "ccontrol/MergingHandler.h"
 #include "ccontrol/TmpTableName.h"
 #include "ccontrol/UserQueryError.h"
+#include "czar/Czar.h"
 #include "global/constants.h"
 #include "global/LogContext.h"
 #include "global/MsgReceiver.h"
@@ -349,8 +350,13 @@ void UserQuerySelect::submit() {
     if (uberJobsEnabled) {
         vector<qdisp::UberJob::Ptr> uberJobs;
 
+        /* &&& For mononode integration tests
         czar::WorkerResourceLists workerResources;
         workerResources.setMonoNodeTest(); //&&& TODO:UJ only good for mono-node test. Need a real list of workers and their chunks. ******
+        */
+        auto czarPtr = czar::Czar::getCzar();
+        auto workerResources = czarPtr->getWorkerResourceLists();
+
 
         // Make a map of all jobs in the executive.
         // &&& TODO:UJ for now, just using ints. At some point, need to check that ResourceUnit databases can be found for all databases in the query
@@ -363,7 +369,7 @@ void UserQuerySelect::submit() {
         // keep cycling through workers until no more chunks to place.
 
         /// make a map<worker, deque<chunkId> that will be destroyed as chunks are checked/used
-        map<string, deque<int>> tmpWorkerList = workerResources.getDequesFor(dbName);
+        map<string, deque<int>> tmpWorkerList = workerResources->getDequesFor(dbName);
 
         // TODO:UJ So UberJobIds don't conflict with chunk numbers or jobIds, start at a large number.
         //       This could use some refinement.

diff --git a/core/modules/czar/Czar.cc b/core/modules/czar/Czar.cc
@@ -454,8 +454,8 @@ void Czar::removeOldResultTables() {
 
 
 bool Czar::setupWorkerResources(std::string const& fName) {
-    _workerResources = std::make_shared<WorkerResourceLists>();
-    return _workerResources->readIn(fName);
+    _workerResourceLists = std::make_shared<WorkerResourceLists>();
+    return _workerResourceLists->readIn(fName);
 }
 
 

diff --git a/core/modules/czar/Czar.h b/core/modules/czar/Czar.h
@@ -112,6 +112,7 @@ class Czar {
     void removeOldResultTables();
 
     bool setupWorkerResources(std::string const& fName); // &&& TODO:UJ remove ???
+    std::shared_ptr<WorkerResourceLists> getWorkerResourceLists() { return _workerResourceLists; } // TODO:UJ
 
 protected:
 
@@ -160,7 +161,7 @@ class Czar {
     std::atomic<bool> _removingOldTables{false};
     std::thread _oldTableRemovalThread; ///< thread needs to remain valid while running.
 
-    std::shared_ptr<WorkerResourceLists> _workerResources; // &&& TODO:UJ remove ???
+    std::shared_ptr<WorkerResourceLists> _workerResourceLists; // &&& TODO:UJ remove ???
 };
 
 }}} // namespace lsst::qserv::czar