From ad3f8f8105600faa350d7263374ae01ace70bbd8 Mon Sep 17 00:00:00 2001 From: Yuval Lifshitz Date: Wed, 11 Jun 2025 14:16:31 +0000 Subject: [PATCH] rgw/logging: fix canonical names Fixes: https://tracker.ceph.com/issues/71638 Signed-off-by: Yuval Lifshitz --- src/rgw/rgw_op.h | 16 ++++++++++++++++ src/rgw/rgw_rest.h | 4 ++-- src/rgw/rgw_rest_pubsub.cc | 3 +++ src/rgw/rgw_rest_s3.h | 6 +++--- src/rgw/rgw_rest_s3website.h | 1 + 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h index ffddbe4c4e7..4e44b86e946 100644 --- a/src/rgw/rgw_op.h +++ b/src/rgw/rgw_op.h @@ -604,6 +604,7 @@ public: virtual void send_response_data() = 0; const char* name() const override { return "get_bucket_replication"; } + std::string canonical_name() const override { return fmt::format("REST.{}.REPLICATION", s->info.method); } virtual uint32_t op_mask() override { return RGW_OP_TYPE_READ; } RGWOpType get_type() override { return RGW_OP_GET_BUCKET_REPLICATION; } }; @@ -619,6 +620,7 @@ public: virtual void send_response() override = 0; virtual int get_params(optional_yield y) = 0; const char* name() const override { return "put_bucket_replication"; } + std::string canonical_name() const override { return fmt::format("REST.{}.REPLICATION", s->info.method); } virtual uint32_t op_mask() override { return RGW_OP_TYPE_WRITE; } RGWOpType get_type() override { return RGW_OP_PUT_BUCKET_REPLICATION; } }; @@ -632,6 +634,7 @@ public: void execute(optional_yield y) override; const char* name() const override { return "delete_bucket_replication"; } + std::string canonical_name() const override { return fmt::format("REST.{}.REPLICATION", s->info.method); } virtual uint32_t op_mask() override { return RGW_OP_TYPE_DELETE; } RGWOpType get_type() override { return RGW_OP_DELETE_BUCKET_REPLICATION;} }; @@ -1016,6 +1019,7 @@ public: void send_response() override = 0; const char* name() const override { return "get_bucket_versioning"; } + std::string canonical_name() const override { return fmt::format("REST.{}.VERSIONING", s->info.method); } RGWOpType get_type() override { return RGW_OP_GET_BUCKET_VERSIONING; } uint32_t op_mask() override { return RGW_OP_TYPE_READ; } }; @@ -1044,6 +1048,7 @@ public: void send_response() override = 0; const char* name() const override { return "set_bucket_versioning"; } + std::string canonical_name() const override { return fmt::format("REST.{}.VERSIONING", s->info.method); } RGWOpType get_type() override { return RGW_OP_SET_BUCKET_VERSIONING; } uint32_t op_mask() override { return RGW_OP_TYPE_WRITE; } }; @@ -1845,6 +1850,7 @@ public: int verify_permission(optional_yield y) override; void execute(optional_yield y) override; const char* name() const override { return "put_bucket_encryption"; } + std::string canonical_name() const override { return fmt::format("REST.{}.ENCRYPTION", s->info.method); } RGWOpType get_type() override { return RGW_OP_PUT_BUCKET_ENCRYPTION; } uint32_t op_mask() override { return RGW_OP_TYPE_WRITE; } }; @@ -1859,6 +1865,7 @@ public: int verify_permission(optional_yield y) override; void execute(optional_yield y) override; const char* name() const override { return "get_bucket_encryption"; } + std::string canonical_name() const override { return fmt::format("REST.{}.ENCRYPTION", s->info.method); } RGWOpType get_type() override { return RGW_OP_GET_BUCKET_ENCRYPTION; } uint32_t op_mask() override { return RGW_OP_TYPE_READ; } }; @@ -1873,6 +1880,7 @@ public: int verify_permission(optional_yield y) override; void execute(optional_yield y) override; const char* name() const override { return "delete_bucket_encryption"; } + std::string canonical_name() const override { return fmt::format("REST.{}.ENCRYPTION", s->info.method); } RGWOpType get_type() override { return RGW_OP_DELETE_BUCKET_ENCRYPTION; } uint32_t op_mask() override { return RGW_OP_TYPE_WRITE; } }; @@ -1890,6 +1898,7 @@ public: void send_response() override = 0; const char* name() const override { return "get_request_payment"; } + std::string canonical_name() const override { return fmt::format("REST.{}.REQUEST_PAYMENT", s->info.method); } RGWOpType get_type() override { return RGW_OP_GET_REQUEST_PAYMENT; } uint32_t op_mask() override { return RGW_OP_TYPE_READ; } }; @@ -1909,6 +1918,7 @@ public: void send_response() override = 0; const char* name() const override { return "set_request_payment"; } + std::string canonical_name() const override { return fmt::format("REST.{}.REQUEST_PAYMENT", s->info.method); } RGWOpType get_type() override { return RGW_OP_SET_REQUEST_PAYMENT; } uint32_t op_mask() override { return RGW_OP_TYPE_WRITE; } }; @@ -2457,6 +2467,7 @@ public: void execute(optional_yield y) override; int get_params(optional_yield y); const char* name() const override { return "put_bucket_policy"; } + std::string canonical_name() const override { return fmt::format("REST.{}.BUCKETPOLICY", s->info.method); } RGWOpType get_type() override { return RGW_OP_PUT_BUCKET_POLICY; } @@ -2473,6 +2484,7 @@ public: } void execute(optional_yield y) override; const char* name() const override { return "get_bucket_policy"; } + std::string canonical_name() const override { return fmt::format("REST.{}.BUCKETPOLICY", s->info.method); } RGWOpType get_type() override { return RGW_OP_GET_BUCKET_POLICY; } @@ -2489,6 +2501,7 @@ public: void execute(optional_yield y) override; int get_params(optional_yield y); const char* name() const override { return "delete_bucket_policy"; } + std::string canonical_name() const override { return fmt::format("REST.{}.BUCKETPOLICY", s->info.method); } RGWOpType get_type() override { return RGW_OP_DELETE_BUCKET_POLICY; } @@ -2662,6 +2675,7 @@ public: int verify_permission(optional_yield y) override; const char* name() const override { return "put_bucket_public_access_block";} virtual RGWOpType get_type() override { return RGW_OP_PUT_BUCKET_PUBLIC_ACCESS_BLOCK; } + std::string canonical_name() const override { return fmt::format("REST.{}.PUBLIC_ACCESS_BLOCK", s->info.method); } virtual uint32_t op_mask() override { return RGW_OP_TYPE_WRITE; } int get_params(optional_yield y); void execute(optional_yield y) override; @@ -2674,6 +2688,7 @@ protected: public: int verify_permission(optional_yield y) override; const char* name() const override { return "get_bucket_public_access_block";} + std::string canonical_name() const override { return fmt::format("REST.{}.PUBLIC_ACCESS_BLOCK", s->info.method); } virtual RGWOpType get_type() override { return RGW_OP_GET_BUCKET_PUBLIC_ACCESS_BLOCK; } virtual uint32_t op_mask() override { return RGW_OP_TYPE_READ; } int get_params(optional_yield y); @@ -2687,6 +2702,7 @@ protected: public: int verify_permission(optional_yield y) override; const char* name() const override { return "delete_bucket_public_access_block";} + std::string canonical_name() const override { return fmt::format("REST.{}.PUBLIC_ACCESS_BLOCK", s->info.method); } virtual RGWOpType get_type() override { return RGW_OP_DELETE_BUCKET_PUBLIC_ACCESS_BLOCK; } virtual uint32_t op_mask() override { return RGW_OP_TYPE_WRITE; } int get_params(optional_yield y); diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h index 87ceb2a86ee..dc440f5a9f7 100644 --- a/src/rgw/rgw_rest.h +++ b/src/rgw/rgw_rest.h @@ -153,7 +153,7 @@ public: RGWGetBucketTags_ObjStore() = default; virtual ~RGWGetBucketTags_ObjStore() = default; - virtual std::string canonical_name() const override { return fmt::format("REST.{}.BUCKET_TAGGING", s->info.method); } + virtual std::string canonical_name() const override { return fmt::format("REST.{}.TAGGING", s->info.method); } }; class RGWPutBucketTags_ObjStore: public RGWPutBucketTags { @@ -161,7 +161,7 @@ public: RGWPutBucketTags_ObjStore() = default; virtual ~RGWPutBucketTags_ObjStore() = default; - virtual std::string canonical_name() const override { return fmt::format("REST.{}.BUCKET_TAGGING", s->info.method); } + virtual std::string canonical_name() const override { return fmt::format("REST.{}.TAGGING", s->info.method); } }; class RGWGetBucketReplication_ObjStore : public RGWGetBucketReplication { diff --git a/src/rgw/rgw_rest_pubsub.cc b/src/rgw/rgw_rest_pubsub.cc index 102bf7f33e6..1e5a5f7e848 100644 --- a/src/rgw/rgw_rest_pubsub.cc +++ b/src/rgw/rgw_rest_pubsub.cc @@ -1189,6 +1189,7 @@ public: } const char* name() const override { return "pubsub_notification_create_s3"; } + std::string canonical_name() const override { return fmt::format("REST.{}.NOTIFICATION", s->info.method); } RGWOpType get_type() override { return RGW_OP_PUBSUB_NOTIF_CREATE; } uint32_t op_mask() override { return RGW_OP_TYPE_WRITE; } @@ -1444,6 +1445,7 @@ class RGWPSDeleteNotifOp : public RGWDefaultResponseOp { } const char* name() const override { return "pubsub_notification_delete_s3"; } + std::string canonical_name() const override { return fmt::format("REST.{}.NOTIFICATION", s->info.method); } RGWOpType get_type() override { return RGW_OP_PUBSUB_NOTIF_DELETE; } uint32_t op_mask() override { return RGW_OP_TYPE_DELETE; } @@ -1548,6 +1550,7 @@ public: } const char* name() const override { return "pubsub_notifications_get_s3"; } + std::string canonical_name() const override { return fmt::format("REST.{}.NOTIFICATION", s->info.method); } RGWOpType get_type() override { return RGW_OP_PUBSUB_NOTIF_LIST; } uint32_t op_mask() override { return RGW_OP_TYPE_READ; } diff --git a/src/rgw/rgw_rest_s3.h b/src/rgw/rgw_rest_s3.h index a1a1132ca7f..02efdbd3702 100644 --- a/src/rgw/rgw_rest_s3.h +++ b/src/rgw/rgw_rest_s3.h @@ -215,7 +215,7 @@ public: ~RGWGetBucketWebsite_ObjStore_S3() override {} void send_response() override; - virtual std::string canonical_name() const override { return fmt::format("WEBSITE.{}.BUCKET_WEBSITE", s->info.method); } + virtual std::string canonical_name() const override { return fmt::format("REST.{}.WEBSITE", s->info.method); } }; class RGWSetBucketWebsite_ObjStore_S3 : public RGWSetBucketWebsite { @@ -225,7 +225,7 @@ public: int get_params(optional_yield y) override; void send_response() override; - virtual std::string canonical_name() const override { return fmt::format("WEBSITE.{}.BUCKET_WEBSITE", s->info.method); } + virtual std::string canonical_name() const override { return fmt::format("REST.{}.WEBSITE", s->info.method); } }; class RGWDeleteBucketWebsite_ObjStore_S3 : public RGWDeleteBucketWebsite { @@ -234,7 +234,7 @@ public: ~RGWDeleteBucketWebsite_ObjStore_S3() override {} void send_response() override; - virtual std::string canonical_name() const override { return fmt::format("WEBSITE.{}.BUCKET_WEBSITE", s->info.method); } + virtual std::string canonical_name() const override { return fmt::format("REST.{}.WEBSITE", s->info.method); } }; class RGWStatBucket_ObjStore_S3 : public RGWStatBucket_ObjStore { diff --git a/src/rgw/rgw_rest_s3website.h b/src/rgw/rgw_rest_s3website.h index 3030926a7a3..2aad81cb668 100644 --- a/src/rgw/rgw_rest_s3website.h +++ b/src/rgw/rgw_rest_s3website.h @@ -97,4 +97,5 @@ public: return RGWGetObj_ObjStore_S3::get_params(y); } } + std::string canonical_name() const override { return fmt::format("WEBSITE.{}.OBJECT", s->info.method); } }; -- 2.39.5