Nizamudeen A
198fc58b38
Merge pull request #47207 from oOHenry/rgw-dashboard-ssl-error
...
mgr/dashboard: fix rgw connect when using ssl
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: David Galloway <dgallowa@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2022-08-22 20:41:02 +05:30
Kefu Chai
4bb9b6c424
Merge pull request #47720 from tchaikov/wip-mgr-dashboard-test-with-headers
...
qa/tasks/mgr/dashboard: accept headers as a param
Reviewed-by: Nizamudeen A <nia@redhat.com>
2022-08-22 22:34:57 +08:00
Ilya Dryomov
37fd6a27e8
Merge pull request #47716 from MalteJ/patch-1
...
doc: virtio discard is supported since kernel 5.0
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2022-08-22 12:23:54 +02:00
Malte Janduda
ad86ffb35d
doc: virtio discard is supported since kernel 5.0
...
Signed-off-by: Malte Janduda <mail@janduda.net>
2022-08-22 11:35:38 +02:00
Pere Diaz Bou
cbe98b345a
Merge pull request #46702 from rhcs-dashboard/expand-cluster-hide-maintenance
...
mgr/dashboard: Hide maintenance option on expand cluster
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>
2022-08-22 09:58:37 +02:00
Kefu Chai
afe8058b6c
qa/tasks/mgr/dashboard: accept headers as an option param
...
* add optional "headers" parameter to _request() and _get()
* correct the test of test_force_no_gzip, as the header in response
should be "application/vnd.ceph.api.v1.0+json", not "application/json"
with this change, we are able to pass headers to _get() in dashboard api
tests.
without this change, we'd have following error when testing
`test_force_no_gzip` defined by `tasks.mgr.dashboard.test_requests.RequestsTest`:
raceback (most recent call last):
File "/home/jenkins-build/build/workspace/ceph-api/src/pybind/mgr/dashboard/services/exception.py", line 47, in dashboard_exception_handler
return handler(*args, **kwargs)
File "/usr/lib/python3/dist-packages/cherrypy/_cpdispatch.py", line 54, in __call__
return self.callable(*self.args, **self.kwargs)
File "/home/jenkins-build/build/workspace/ceph-api/src/pybind/mgr/dashboard/controllers/_base_controller.py", line 263, in inner
ret = func(*args, **kwargs)
TypeError: Summary.__call__() got an unexpected keyword argument 'headers'
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-08-22 14:01:16 +08:00
Kefu Chai
5fd0f9cd48
Merge pull request #47711 from tchaikov/wip-crimson-os-cleanups
...
crimson/os: cleanups
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2022-08-22 13:29:19 +08:00
Anthony D'Atri
1c9e84a447
Merge pull request #47715 from maryfrances01/wip-doc-punctuation-error
...
doc/radosgw: Fix punctuation and grammar in encryption.rst
2022-08-21 09:59:28 -07:00
Mary Frances
77770920f7
doc: Fixes a punctuation and grammar issue
2022-08-21 06:29:41 -07:00
Ronen Friedman
9f77cc6763
Merge pull request #47639 from ronen-fr/wip-rf-scrubmap-swap
...
osd: fix ScrubMap::swap() to include all ScrubMap data members
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2022-08-21 08:57:19 +03:00
Mary Frances
491391f06c
doc: Fixes a punctuation and grammar issue
...
Signed-off-by: Mary Frances Hull mhull@redhat.com
2022-08-20 09:46:24 -07:00
Kefu Chai
0d47e59f02
Merge pull request #44356 from SMIL-Infra/clog
...
common,mon: use fmt::print(cerr, ...) for stderr logging
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2022-08-20 21:55:22 +08:00
Kefu Chai
ce184880a4
crimson/os: use IsFullKey in *::estimate_insert()
...
to fade out KeyT, so we can have more straightforward definitions.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-08-20 19:55:46 +08:00
Kefu Chai
65aaea8f8e
crimson/os: use use IsFullKey in node_fields_2_t::insert_at()
...
to fade out KeyT, so we can have more straightforward definitions.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-08-20 19:55:42 +08:00
Ilya Dryomov
e4426c334b
Merge pull request #47325 from CongMinYin/fix-owner-lock-ordering
...
librbd/cache/pwl: narrow the scope of m_lock in write_image_cache_state()
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2022-08-20 12:41:55 +02:00
Kefu Chai
3c2084c134
crimson/os: use IsFullKey in _node_fields_013_t::append_key()
...
to fade out KeyT, so we can have more straightforward definitions.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-08-20 18:12:23 +08:00
Kefu Chai
7e951f3af1
crimson/os: avoid using KeyT in is_valid_key()
...
and we don't need to specify KeyT when instantiating this template
function.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-08-20 15:43:27 +08:00
Kefu Chai
a964600652
crimson/os: avoid using KeyT in ns_oid_view_t
...
so we don't need to use it when instantiating the template member
functions of this class.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-08-20 15:43:27 +08:00
Casey Bodley
9a5e89749a
Merge pull request #47628 from mkogan1/wip-fix-tcmalloc-link
...
rgw: fix linking with tcmalloc when specified by -DALLOCATOR
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2022-08-19 13:34:47 -04:00
Ronen Friedman
5e1b230554
osd: modify two ScrubMap data members from fields to full variables
...
as there is no size advantage in this specific case.
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
2022-08-19 19:21:20 +03:00
Ronen Friedman
792e93607c
osd: fix ScrubMap::swap() to include all ScrubMap data members
...
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
2022-08-19 19:21:20 +03:00
Casey Bodley
859cab820f
Merge pull request #47632 from linuxbox2/wip-rgw-53455
...
rgw/s3: add conditional json output for s3:ListBucket
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2022-08-19 11:06:27 -04:00
Casey Bodley
f61b38dc82
Merge pull request #46443 from ybwang0211/head_obj
...
rgw: The error reported in the "rgw_s3_prepare_decrypt" function is unreasonable
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2022-08-19 09:25:12 -04:00
Casey Bodley
16c0ba743b
Merge pull request #46547 from Huber-ming/check_appendable
...
rgw: check object appendable when check_disk_state
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2022-08-19 09:24:35 -04:00
Casey Bodley
22d11aeb19
Merge pull request #47228 from Huber-ming/multi_meta
...
rgw: 'bucket check' deletes index of multipart meta when its pending_map is nonempty
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2022-08-19 09:23:58 -04:00
Casey Bodley
436cbbe0e4
Merge pull request #47547 from mdw-at-linuxbox/wip-master-xamzdate-1
...
rgw: x-amz-date change breaks certain cases of aws sig v4.
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2022-08-19 09:23:44 -04:00
Rishabh Dave
cef4c8d832
Merge pull request #45036 from rishabh-d-dave/qa-fix-is_mounted
...
qa/cephfs: upgrade is_mounted() in mount.py
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
2022-08-19 18:43:59 +05:30
Rishabh Dave
775ed5fe64
Merge pull request #45869 from neesingh-rh/fix_55234
...
mgr/snap_schedule: replace .snap with the client configured snap dir name
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
2022-08-19 18:38:51 +05:30
Rishabh Dave
0a4fe3904f
Merge pull request #46749 from ibm-s390-cloud/fsmap_switch_to_iterator
...
fsmap: switch to using iterator based loop
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
2022-08-19 18:32:38 +05:30
Yingxin
d925198451
Merge pull request #47691 from myoungwon/wip-cbjournal-integration
...
crimson/os/seastore: CBJournal integration works
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2022-08-19 17:03:34 +08:00
Radoslaw Zarzynski
6db862f15c
Merge pull request #47597 from NitzanMordhai/wip-nitzan-crimson-watch-list-empty-return-code
...
crimson/osd: watch list empty return incorrect
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Sam Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2022-08-19 10:59:01 +02:00
Kefu Chai
f143841394
Merge pull request #47670 from rzarzynski/wip-common-ftbfs-systemd
...
common: fix a FTBFS in Journald.cc when building without systemd
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2022-08-19 15:34:47 +08:00
Kefu Chai
132de8c844
Merge pull request #47680 from tchaikov/wip-crimson-cleanups
...
crimson: cleanups to use `IsFullKey` concept
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2022-08-19 12:40:06 +08:00
myoungwon oh
02a38a00bd
crimson/os/seastore: introduce finish_commit to update tails after trim transaction
...
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2022-08-19 12:42:25 +09:00
myoungwon oh
1c33a2aaf5
crimson/os/seastore/cbjournal: rename journal_tail to dirty_tail
...
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2022-08-19 12:42:06 +09:00
myoungwon oh
41469d628e
crimson/os/seastore/cbjournal: make cbjournal to store alloc_tail
...
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2022-08-19 12:41:23 +09:00
myoungwon oh
8aab9256b1
crimson/os/seastore/cbjournal: make journal_tail and written_to to use journal_seq_t instead of rbm_abs_addr
...
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2022-08-19 12:40:43 +09:00
myoungwon oh
4ba6ade57c
crimson/os/seastore: divide the role of open_device_read_header into device.mount()
...
and open_for_mount()
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2022-08-19 12:39:42 +09:00
Casey Bodley
74272753b8
Merge pull request #47615 from adamemerson/wip-objv-doc
...
rgw: Document `RGWOvjVersionTracker`
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2022-08-18 18:22:15 -04:00
Ilya Dryomov
ad504b10f6
librbd/cache/pwl: generate image cache state json under m_lock
...
The previous commit moved the entirety of write_image_cache_state()
from under m_lock. This was a step too far because the generated image
cache state json is no longer guaranteed to be consistent.
Arrange for m_lock to still be held during image cache json generation
but released before owner_lock is grabbed.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2022-08-18 20:11:12 +02:00
Kefu Chai
82dff11ef0
crimson/os: make _node_fields_013_t::insert_at() use IsFullKey
...
less repeatings this way
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-08-19 00:55:26 +08:00
Josh Durgin
857f2bdb60
Merge pull request #47288 from batrick/i56274
...
debian: add libsqlite3-mod-ceph dependency for ceph-mgr
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2022-08-18 09:29:28 -07:00
Kefu Chai
72f91fad9e
crimson/os: define *::from_key() with IsFullKey
...
more compact this way.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-08-19 00:28:45 +08:00
Kefu Chai
b374301ece
crimson: move helper classes down
...
so we can use the concept of `IsFullKey` for defining accessors in the
incoming commit.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-08-18 23:45:23 +08:00
Kefu Chai
d143757d24
crimson: define encode_key() with IsFullKey constrait
...
also, let the compiler to deduce the type of the template parameter,
less repeating and less error-prone this way.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-08-18 23:10:23 +08:00
Radosław Zarzyński
dc0d636af7
common: fix a FTBFS in Journald.cc when building without systemd
...
This came from Josh Salomon:
```
/home/jsalomon/src/prim_score/src/common/Journald.h:93:24: error: ‘SubsystemMap’ does not name a type
93 | JournaldLogger(const SubsystemMap *) {}
| ^~~~~~~~~~~~
/home/jsalomon/src/prim_score/src/common/Journald.h:94:23: error: ‘Entry’ does not name a type
94 | int log_entry(const Entry &) {
|
```
Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
2022-08-18 13:45:24 +02:00
Arthur Outhenin-Chalandre
50f4580686
Merge pull request #47633 from bosc0/alerts_multicluster
...
prometheus: add multicluster support to alerts
2022-08-18 13:35:24 +02:00
Matan
521f83aa21
Merge pull request #47554 from Matan-B/wip-matanb-c-rados-python
...
qa/suite/crimson-rados: Fix rados_python test
Reviewed by: Samuel Just <sjust@redhat.com>
Reviewed by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed by: Nitzan Mordechai <nmordech@redhat.com>
2022-08-18 13:52:45 +03:00
Matan
bccd2dbb20
Merge pull request #47653 from Matan-B/wip-matanb-snapmapper-pending-typo
...
PendingReleaseNotes: fix typo in 15.2.17
Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
2022-08-18 08:56:38 +03:00
Matan
da4e28a53f
Merge pull request #47392 from Matan-B/wip-matanb-memstore-subsys
...
common: MemStore debug subsystem
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2022-08-18 08:48:59 +03:00