Skip to content

Commit

Permalink
Changed version numer to 35.
Browse files Browse the repository at this point in the history
  • Loading branch information
jgates108 committed Jul 30, 2024
1 parent 98a0142 commit 90cf22a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/admin/python/lsst/qserv/admin/replicationInterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ def __init__(
self.repl_ctrl = urlparse(repl_ctrl_uri)
self.auth_key = auth_key
self.admin_auth_key = admin_auth_key

# Must match MetaModule::version in http/MetaModule.cc
self.repl_api_version = 35
_log.debug(f"ReplicationInterface %s", self.repl_ctrl)

Expand Down
1 change: 1 addition & 0 deletions src/czar/HttpCzarWorkerModule.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 6 additions & 1 deletion src/http/MetaModule.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ string const adminAuthKey;

namespace lsst::qserv::http {

unsigned int const MetaModule::version = 35; // &&&uj
// 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,
shared_ptr<qhttp::Request> const& req, shared_ptr<qhttp::Response> const& resp,
Expand Down

0 comments on commit 90cf22a

Please sign in to comment.