cleanup

ecmwf · Dec 8, 2023 · e094c0f · e094c0f
1 parent de5d324
commit e094c0f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/fdb5/remote/RemoteStore.cc b/src/fdb5/remote/RemoteStore.cc
@@ -474,7 +474,7 @@ void RemoteStore::remove(const Key& key) const {
 }
 
 void RemoteStore::print(std::ostream &out) const {
-    out << "RemoteStore(host=" << /*controlEndpoint() << ", data=" << dataEndpoint() << */ ")";
+    out << "RemoteStore(host=" << controlEndpoint() /* << ", data=" << dataEndpoint() */ << ")";
 }
 
 bool RemoteStore::handle(Message message, uint32_t requestID) {

diff --git a/src/fdb5/remote/client/ClientConnection.cc b/src/fdb5/remote/client/ClientConnection.cc
@@ -133,7 +133,7 @@ eckit::LocalConfiguration ClientConnection::availableFunctionality() const {
 
 // -----------------------------------------------------------------------------------------------------
 
-void ClientConnection::controlWrite(Client& client, Message msg, uint32_t requestID, uint32_t clientID, std::vector<std::pair<const void*, uint32_t>> data) {
+void ClientConnection::controlWrite(Client& client, Message msg, uint32_t requestID, uint32_t archiverID, std::vector<std::pair<const void*, uint32_t>> data) {
 
     {
         std::lock_guard<std::mutex> lock(requestMutex_);
@@ -143,7 +143,7 @@ void ClientConnection::controlWrite(Client& client, Message msg, uint32_t reques
         }
     }
 
-    controlWrite(msg, clientID ? clientID : client.id(), requestID, data);
+    controlWrite(msg, archiverID ? archiverID : client.id(), requestID, data);
 }
 
 void ClientConnection::controlWrite(Message msg, uint32_t clientID, uint32_t requestID, std::vector<std::pair<const void*, uint32_t>> data) {

diff --git a/src/fdb5/remote/client/ClientConnection.h b/src/fdb5/remote/client/ClientConnection.h
@@ -44,7 +44,7 @@ class ClientConnection : eckit::NonCopyable {
     ClientConnection(const FdbEndpoint& controlEndpoint);
     virtual ~ClientConnection();
 
-    void controlWrite(Client& client, remote::Message msg, uint32_t requestID, uint32_t clientID=0, std::vector<std::pair<const void*, uint32_t>> data={});
+    void controlWrite(Client& client, remote::Message msg, uint32_t requestID, uint32_t archiverID=0, std::vector<std::pair<const void*, uint32_t>> data={});
     void dataWrite   (Client& client, remote::Message msg, uint32_t requestID, std::vector<std::pair<const void*, uint32_t>> data={});
 
     bool connect(bool singleAttempt = false);