Changed version numer to 35.

lsst · Jul 23, 2024 · 01ceb2f · 01ceb2f
1 parent 66ac35e
commit 01ceb2f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/admin/python/lsst/qserv/admin/replicationInterface.py b/src/admin/python/lsst/qserv/admin/replicationInterface.py
@@ -201,7 +201,8 @@ def __init__(
         self.repl_ctrl = urlparse(repl_ctrl_uri)
         self.auth_key = auth_key
         self.admin_auth_key = admin_auth_key
-        self.repl_api_version = 33
+        # Must match MetaModule::version in http/MetaModule.cc
+        self.repl_api_version = 35
         _log.debug(f"ReplicationInterface %s", self.repl_ctrl)
 
     def version(self) -> str:

diff --git a/src/czar/HttpCzarWorkerModule.cc b/src/czar/HttpCzarWorkerModule.cc
@@ -62,6 +62,7 @@ HttpCzarWorkerModule::HttpCzarWorkerModule(string const& context, shared_ptr<qht
 json HttpCzarWorkerModule::executeImpl(string const& subModuleName) {
     string const func = string(__func__) + "[sub-module='" + subModuleName + "']";
     debug(func);
+    cconfig::CzarConfig::instance()->replicationInstanceId();
     enforceCzarName(func);
     if (subModuleName == "QUERYJOB-ERROR")
         return _queryJobError();

diff --git a/src/http/MetaModule.cc b/src/http/MetaModule.cc
@@ -37,7 +37,12 @@ string const adminAuthKey;
 
 namespace lsst::qserv::http {
 
-unsigned int const MetaModule::version = 34;  // TODO:UJ this may need to change when merging the branch.
+// MetaModule::version is the ultimate source of truth for the version number.
+// All version values must match. Other version location are in :
+//      class ReplicationInterface repl_api_version
+//               in src/admin/python/lsst/qserv/admin/replicationinterface.py
+//      RestAPIVersion in src/www/qserv/js/Common.js
+unsigned int const MetaModule::version = 35;  // TODO:UJ this may need to change when merging the branch.
 
 void MetaModule::process(string const& context, nlohmann::json const& info, qhttp::Request::Ptr const& req,
                          qhttp::Response::Ptr const& resp, string const& subModuleName) {

diff --git a/src/www/qserv/js/Common.js b/src/www/qserv/js/Common.js
@@ -6,7 +6,7 @@ function(sqlFormatter,
          _) {
 
     class Common {
-        static RestAPIVersion = 33;
+        static RestAPIVersion = 35;
         static query2text(query, expanded) {
             if (expanded) {
                 return sqlFormatter.format(query, Common._sqlFormatterConfig);