From 3b573f27f6b4e7626dc69246475067fa8d998129 Mon Sep 17 00:00:00 2001 From: Samarah Date: Fri, 29 Sep 2023 13:26:50 +0000 Subject: [PATCH] d4n: Add connection client names for policy and directory Signed-off-by: Samarah --- src/rgw/driver/d4n/d4n_directory.h | 2 ++ src/rgw/driver/d4n/d4n_policy.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rgw/driver/d4n/d4n_directory.h b/src/rgw/driver/d4n/d4n_directory.h index 8bf618e59ed..2ad56f0f619 100644 --- a/src/rgw/driver/d4n/d4n_directory.h +++ b/src/rgw/driver/d4n/d4n_directory.h @@ -56,6 +56,7 @@ class ObjectDirectory: public Directory { // weave into write workflow -Sam config cfg; cfg.addr.host = cct->_conf->rgw_d4n_host; // same or different address from block directory? -Sam cfg.addr.port = std::to_string(cct->_conf->rgw_d4n_port); + cfg.clientname = "D4N.ObjectDir"; if (!cfg.addr.host.length() || !cfg.addr.port.length()) { ldpp_dout(dpp, 10) << "D4N Directory " << __func__ << ": Object directory endpoint was not configured correctly" << dendl; @@ -95,6 +96,7 @@ class BlockDirectory: public Directory { config cfg; cfg.addr.host = cct->_conf->rgw_d4n_host; cfg.addr.port = std::to_string(cct->_conf->rgw_d4n_port); + cfg.clientname = "D4N.BlockDir"; if (!cfg.addr.host.length() || !cfg.addr.port.length()) { ldpp_dout(dpp, 10) << "D4N Directory " << __func__ << ": Block directory endpoint was not configured correctly" << dendl; diff --git a/src/rgw/driver/d4n/d4n_policy.h b/src/rgw/driver/d4n/d4n_policy.h index 7b9b08eb730..2b9ac5cea32 100644 --- a/src/rgw/driver/d4n/d4n_policy.h +++ b/src/rgw/driver/d4n/d4n_policy.h @@ -76,8 +76,8 @@ class LFUDAPolicy : public CachePolicy { dir = new BlockDirectory{io}; } ~LFUDAPolicy() { - //delete dir; shutdown(); + delete dir; } virtual int init(CephContext *cct, const DoutPrefixProvider* dpp) { @@ -86,6 +86,7 @@ class LFUDAPolicy : public CachePolicy { config cfg; cfg.addr.host = address.substr(0, address.find(":")); cfg.addr.port = address.substr(address.find(":") + 1, address.length()); + cfg.clientname = "D4N.Policy"; if (!cfg.addr.host.length() || !cfg.addr.port.length()) { ldpp_dout(dpp, 10) << "RGW Redis Cache: Redis cache endpoint was not configured correctly" << dendl; -- 2.47.3