diff --git a/src/replica/config/ConfigTestData.cc b/src/replica/config/ConfigTestData.cc index 886617a15..1881ef41b 100644 --- a/src/replica/config/ConfigTestData.cc +++ b/src/replica/config/ConfigTestData.cc @@ -43,8 +43,7 @@ map> ConfigTestData::parameters() { {"xrootd", {"auto-notify", "request-timeout-sec", "host", "port", "allow-reconnect", "reconnect-timeout"}}, {"worker", - {"technology", - "num-threads", + {"num-threads", "num-svc-processing-threads", "num-fs-processing-threads", "fs-buf-size-bytes", @@ -113,8 +112,7 @@ json ConfigTestData::data() { {"request-timeout-sec", 400}, {"allow-reconnect", 0}, {"reconnect-timeout", 500}}); - generalObj["worker"] = json::object({{"technology", "POSIX"}, - {"num-threads", 3}, + generalObj["worker"] = json::object({{"num-threads", 3}, {"num-svc-processing-threads", 4}, {"num-fs-processing-threads", 5}, {"fs-buf-size-bytes", 1024}, diff --git a/src/replica/config/ConfigurationSchema.cc b/src/replica/config/ConfigurationSchema.cc index 41b8fbdac..7dd639b70 100644 --- a/src/replica/config/ConfigurationSchema.cc +++ b/src/replica/config/ConfigurationSchema.cc @@ -278,12 +278,7 @@ json const ConfigurationSchema::_schemaJson = json::object( " (if the server is not up, or if it's not reachable for some reason)"}, {"default", 3600}}}}}, {"worker", - {{"technology", - {{"description", - "The name of a technology for implementing replica management requests at workers."}, - {"restricted", {{"type", "set"}, {"values", json::array({"FS", "POSIX", "TEST"})}}}, - {"default", "FS"}}}, - {"num-threads", + {{"num-threads", {{"description", "The number of threads managed by BOOST ASIO. Must be greater than 0." " Note that setting too many threads may result in a significant memory footprint" diff --git a/src/replica/proto/protocol.proto b/src/replica/proto/protocol.proto index f4ce82b4c..25c291e29 100644 --- a/src/replica/proto/protocol.proto +++ b/src/replica/proto/protocol.proto @@ -820,7 +820,6 @@ message ProtocolServiceResponse { RUNNING = 2; } required ServiceState service_state = 3; - required string technology = 4; /// When the service started (milliseconds since UNIX Epoch) required uint64 start_time = 5; diff --git a/src/replica/requests/ServiceManagementRequestBase.cc b/src/replica/requests/ServiceManagementRequestBase.cc index 66ba83376..a42e4b707 100644 --- a/src/replica/requests/ServiceManagementRequestBase.cc +++ b/src/replica/requests/ServiceManagementRequestBase.cc @@ -97,7 +97,6 @@ void ServiceState::set(ProtocolServiceResponse const& message) { throw runtime_error("ServiceState::" + string(__func__) + " service state found in protocol is unknown"); } - technology = message.technology(); startTime = message.start_time(); numNewRequests = message.num_new_requests(); @@ -121,7 +120,6 @@ ostream& operator<<(ostream& os, ServiceState const& ss) { os << "ServiceState:\n" << "\n Summary:\n\n" << " service state: " << ss.state2string() << "\n" - << " technology: " << ss.technology << "\n" << " start time [ms]: " << ss.startTime << " (" << secondsAgo << " seconds ago)\n" << " total new requests: " << ss.numNewRequests << "\n" << " total in-progress requests: " << ss.numInProgressRequests << "\n" diff --git a/src/replica/requests/ServiceManagementRequestBase.h b/src/replica/requests/ServiceManagementRequestBase.h index 0d7c272b1..5bc64db34 100644 --- a/src/replica/requests/ServiceManagementRequestBase.h +++ b/src/replica/requests/ServiceManagementRequestBase.h @@ -51,9 +51,6 @@ struct ServiceState { enum State { SUSPEND_IN_PROGRESS = 0, SUSPENDED = 1, RUNNING = 2 }; State state; - /// The back-end technology - std::string technology; - /// When the service started (milliseconds since UNIX Epoch) uint64_t startTime; diff --git a/src/replica/tests/testConfiguration.cc b/src/replica/tests/testConfiguration.cc index 8e1190525..990e7f1dd 100644 --- a/src/replica/tests/testConfiguration.cc +++ b/src/replica/tests/testConfiguration.cc @@ -158,7 +158,6 @@ BOOST_AUTO_TEST_CASE(ConfigurationTestReadingGeneralParameters) { BOOST_CHECK(config->get("database", "services-pool-size") == 2); - BOOST_CHECK(config->get("worker", "technology") == "POSIX"); BOOST_CHECK(config->get("worker", "num-threads") == 3); BOOST_CHECK(config->get("worker", "num-svc-processing-threads") == 4); BOOST_CHECK(config->get("worker", "num-fs-processing-threads") == 5); @@ -322,10 +321,6 @@ BOOST_AUTO_TEST_CASE(ConfigurationTestModifyingGeneralParameters) { BOOST_REQUIRE_NO_THROW(config->set("database", "services-pool-size", 3)); BOOST_CHECK(config->get("database", "services-pool-size") == 3); - BOOST_CHECK_THROW(config->set("worker", "technology", ""), std::invalid_argument); - BOOST_REQUIRE_NO_THROW(config->set("worker", "technology", "FS")); - BOOST_CHECK(config->get("worker", "technology") == "FS"); - BOOST_CHECK_THROW(config->set("worker", "num-threads", 0), std::invalid_argument); BOOST_REQUIRE_NO_THROW(config->set("worker", "num-threads", 4)); BOOST_CHECK(config->get("worker", "num-threads") == 4); diff --git a/src/replica/worker/WorkerProcessor.cc b/src/replica/worker/WorkerProcessor.cc index 7a111f3a7..a52b1cf08 100644 --- a/src/replica/worker/WorkerProcessor.cc +++ b/src/replica/worker/WorkerProcessor.cc @@ -561,7 +561,6 @@ void WorkerProcessor::setServiceResponse(ProtocolServiceResponse& response, stri replica::Lock lock(_mtx, _context(__func__)); response.set_status(status); - response.set_technology("FS"); response.set_start_time(_startTime); switch (state()) {