From: Krunal Chheda <kchheda3@bloomberg.net>
Date: Fri, 27 Oct 2023 15:28:06 +0000 (-0400)
Subject: Merge branch 'main' into wip-topic-policy
X-Git-Tag: v19.0.0~234^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F53848%2Fhead;p=ceph.git

Merge branch 'main' into wip-topic-policy
---

1d6cf1f190fe041ef539a5d76d5f14e510701b62
diff --cc src/common/options/rgw.yaml.in
index 37453605260b,1dfb96228944..50e1e4450a58
--- a/src/common/options/rgw.yaml.in
+++ b/src/common/options/rgw.yaml.in
@@@ -3850,18 -3896,47 +3896,61 @@@ options
    services:
    - rgw
    with_legacy: true
 +- name: mandatory_topic_permissions
 +  type: bool
 +  level: basic
 +  desc: Whether to validate user permissions to access notification topics.
 +  long_desc: If true, all users (other then the owner of the topic) will need
 +    to have a policy to access topics.
 +    The topic policy can be set by owner via CreateTopic() or SetTopicAttribute().
 +    Following permissions can be granted "sns:Publish", "sns:GetTopicAttributes",
 +    "sns:SetTopicAttributes" and "sns:DeleteTopic" via Policy.
 +    NOTE that even if set to "false" topics will still follow the policies if set on them.
 +  default: false
 +  services:
 +  - rgw
 +  with_legacy: true
- 
+ - name: rgw_user_counters_cache
+   type: bool
+   level: dev
+   default: false
+   desc: enable a rgw perf counters cache for counters with user label
+   long desc: If set to true, rgw creates perf counters with a label for the user and stores them
+     in a perf counters cache. This perf counters cache contains only perf counters labeled by user.
+   see_also:
+   - rgw_user_counters_cache_size
+   services:
+   - rgw
+   with_legacy: true
+ - name: rgw_user_counters_cache_size
+   type: uint
+   level: advanced
+   desc: Number of labeled perf counters the user perf counters cache can store
+   default: 10000
+   services:
+   - rgw
+   see_also:
+   - rgw_user_counters_cache
+   with_legacy: true
+ - name: rgw_bucket_counters_cache
+   type: bool
+   level: dev
+   default: false
+   desc: enable a rgw perf counters cache for counters with bucket label
+   long desc: If set to true, rgw creates perf counters with a label for the bucket and stores them
+     in a perf counters cache. This perf counters cache contains only perf counters labeled by bucket.
+   see_also:
+   - rgw_bucket_counters_cache_size
+   services:
+   - rgw
+   with_legacy: true
+ - name: rgw_bucket_counters_cache_size
+   type: uint
+   level: advanced
+   desc: Number of labeled perf counters the bucket perf counters cache can store
+   default: 10000
+   services:
+   - rgw
+   see_also:
+   - rgw_bucket_counters_cache
+   with_legacy: true