From 98e72261ea7bbfe6c3642e795758fc9cf751221e Mon Sep 17 00:00:00 2001 From: Yuval Lifshitz Date: Sun, 16 Jan 2022 18:35:23 +0200 Subject: [PATCH] rgw/multisite: add type to RGW_OP_SYNC_DATALOG_NOTIFY2 without that the following errors are happening during sync: ERROR: AWS4 completion for operation: 0, NOT IMPLEMENTED op->ERRORHANDLER: err_no=-2201 new_err_no=-2201 Signed-off-by: Yuval Lifshitz --- src/rgw/rgw_op_type.h | 1 + src/rgw/rgw_rest_log.h | 1 + src/rgw/rgw_rest_s3.cc | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_op_type.h b/src/rgw/rgw_op_type.h index 6fe5a564da6..58ea807318e 100644 --- a/src/rgw/rgw_op_type.h +++ b/src/rgw/rgw_op_type.h @@ -92,6 +92,7 @@ enum RGWOpType { RGW_OP_GET_BUCKET_META_SEARCH, RGW_OP_DEL_BUCKET_META_SEARCH, RGW_OP_SYNC_DATALOG_NOTIFY, + RGW_OP_SYNC_DATALOG_NOTIFY2, RGW_OP_SYNC_MDLOG_NOTIFY, RGW_OP_PERIOD_POST, /* sts specific*/ diff --git a/src/rgw/rgw_rest_log.h b/src/rgw/rgw_rest_log.h index f01fcf857e9..0838a0e510b 100644 --- a/src/rgw/rgw_rest_log.h +++ b/src/rgw/rgw_rest_log.h @@ -290,6 +290,7 @@ public: const char* name() const override { return "datalog_notify2"; } + RGWOpType get_type() override { return RGW_OP_SYNC_DATALOG_NOTIFY2; } }; class RGWOp_DATALog_Delete : public RGWRESTOp { diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index ba4b4471a81..db7d54cdcf3 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -5650,6 +5650,7 @@ AWSGeneralAbstractor::get_auth_data_v4(const req_state* const s, case RGW_OP_DELETE_MULTI_OBJ: case RGW_OP_ADMIN_SET_METADATA: case RGW_OP_SYNC_DATALOG_NOTIFY: + case RGW_OP_SYNC_DATALOG_NOTIFY2: case RGW_OP_SYNC_MDLOG_NOTIFY: case RGW_OP_PERIOD_POST: case RGW_OP_SET_BUCKET_WEBSITE: @@ -5673,7 +5674,7 @@ AWSGeneralAbstractor::get_auth_data_v4(const req_state* const s, case RGW_OP_GET_OBJ://s3select its post-method(payload contain the query) , the request is get-object break; default: - ldpp_dout(s, 10) << "ERROR: AWS4 completion for this operation NOT IMPLEMENTED" << dendl; + ldpp_dout(s, 10) << "ERROR: AWS4 completion for operation: " << s->op_type << ", NOT IMPLEMENTED" << dendl; throw -ERR_NOT_IMPLEMENTED; } -- 2.39.5