]>
git.apps.os.sepia.ceph.com Git - ceph-ci.git/log 
Sage Weil  [Fri, 21 May 2021 22:01:03 +0000  (18:01 -0400)] 
pybind/ceph_argparse: adjust help text for non-positional argsSigned-off-by: Sage Weil <sage@newdream.net> 
Sage Weil  [Fri, 21 May 2021 22:00:15 +0000  (18:00 -0400)] 
pybind/ceph_argparse: track a 'positional' property on cli argsSigned-off-by: Sage Weil <sage@newdream.net> 
Josh Durgin  [Fri, 21 May 2021 00:08:22 +0000  (17:08 -0700)] 
Merge pull request #41382 from tchaikov/wip-doc-msgr-fsm-diagramReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Josh Durgin  [Fri, 21 May 2021 00:07:34 +0000  (17:07 -0700)] 
Merge pull request #41408 from zdover23/wip-doc-security-2021-05-19-fourth-itemReviewed-by: Josh Durgin <jdurgin@redhat.com> 
zdover23  [Thu, 20 May 2021 21:18:09 +0000  (07:18 +1000)] 
Merge pull request #41407 from zdover23/wip-doc-security-2021-05-19-second-itemReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Patrick Donnelly  [Thu, 20 May 2021 19:43:53 +0000  (12:43 -0700)] 
Merge PR #41358 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Thu, 20 May 2021 19:43:25 +0000  (12:43 -0700)] 
Merge PR #41338 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Thu, 20 May 2021 19:42:19 +0000  (12:42 -0700)] 
Merge PR #41084 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Zac Dover  [Wed, 19 May 2021 14:29:40 +0000  (00:29  +1000)] 
doc/security: updating fourth itemSigned-off-by: Zac Dover <zac.dover@gmail.com> 
Zac Dover  [Wed, 19 May 2021 14:07:45 +0000  (00:07  +1000)] 
doc/security: enriching second pointSigned-off-by: Zac Dover <zac.dover@gmail.com> 
zdover23  [Thu, 20 May 2021 19:20:49 +0000  (05:20  +1000)] 
Merge pull request #41411 from zdover23/wip-doc-security-2021-05-19-eighth-itemReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Samuel Just  [Thu, 20 May 2021 18:52:58 +0000  (11:52 -0700)] 
Merge pull request #41437 from tchaikov/wip-crimson-loggingReviewed-by: Chunmei Liu <chunmei.liu@intel.com> Reviewed-by: Samuel Just <sjust@redhat.com> 
Ilya Dryomov  [Thu, 20 May 2021 14:41:22 +0000  (16:41 +0200)] 
Merge pull request #41070 from sunnyku/wip-rbd-50522Reviewed-by: Mykola Golub <mgolub@suse.com> Reviewed-by: Ilya Dryomov <idryomov@gmail.com> 
Ilya Dryomov  [Thu, 20 May 2021 14:40:14 +0000  (16:40 +0200)] 
Merge pull request #41340 from tchaikov/wip-ceph-allocatorReviewed-by: Ilya Dryomov <idryomov@gmail.com> 
Zac Dover  [Wed, 19 May 2021 14:49:23 +0000  (00:49  +1000)] 
doc/security: enriching eighth listitemSigned-off-by: Zac Dover <zac.dover@gmail.com> 
Ernesto Puerta  [Thu, 20 May 2021 09:33:39 +0000  (11:33 +0200)] 
Merge pull request #40328 from rhcs-dashboard/fix-49262-masterReviewed-by: Aashish Sharma <aasharma@redhat.com> Reviewed-by: Alfonso Martínez <almartin@redhat.com> Reviewed-by: Avan Thakkar <athakkar@redhat.com> Reviewed-by: Ernesto Puerta <epuertat@redhat.com> Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com> Reviewed-by: Nizamudeen A <nia@redhat.com> Reviewed-by: Paul Cuzner <pcuzner@redhat.com> Reviewed-by: sebastian-philipp <NOT@FOUND> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Thu, 20 May 2021 09:19:44 +0000  (17:19 +0800)] 
crimson/os/seastore/logging: remove comma
to address the FTBFS of the release builds.
fix a regression introduced by 
c39d64d7bbd7d7cf1d476a44f60c70edce55f3d1 
Signed-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Thu, 20 May 2021 06:34:43 +0000  (14:34 +0800)] 
Merge pull request #41396 from tchaikov/wip-crimson-metricsReviewed-by: Samuel Just <sjust@redhat.com> Reviewed-by: Chunmei Liu <chunmei.liu@intel.com> 
Kefu Chai  [Thu, 20 May 2021 06:29:05 +0000  (14:29 +0800)] 
Merge pull request #41258 from ronen-fr/wip-ronenf-repair-statReviewed-by: Neha Ojha <nojha@redhat.com> 
Kefu Chai  [Thu, 20 May 2021 06:25:18 +0000  (14:25 +0800)] 
Merge pull request #41264 from mgfritch/cephadm-sysctl-osdReviewed-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Thu, 20 May 2021 06:24:07 +0000  (14:24 +0800)] 
Merge pull request #41368 from idryomov/wip-monc-rotating-timeoutReviewed-by: Patrick Donnelly <pdonnell@redhat.com> Reviewed-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Thu, 20 May 2021 06:20:21 +0000  (14:20 +0800)] 
Merge pull request #41277 from david-caro/consider_dev_root_mountedReviewed-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Thu, 20 May 2021 06:19:15 +0000  (14:19 +0800)] 
Merge pull request #41287 from adk3798/daemon-for-service-warnReviewed-by: Juan Miguel Olmo <jolmomar@redhat.com> 
Kefu Chai  [Thu, 20 May 2021 06:18:43 +0000  (14:18 +0800)] 
Merge pull request #41356 from tchaikov/wip-options-mgr-monReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Kefu Chai  [Thu, 20 May 2021 06:16:59 +0000  (14:16 +0800)] 
Merge pull request #41373 from myoungwon/wip-fix-50806Reviewed-by: Samuel Just <sjust@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 10:21:05 +0000  (18:21 +0800)] 
test/crimson: remove unnecessary local variableSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 10:02:59 +0000  (18:02 +0800)] 
test/crimson/seastore: teardown in reactorSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 04:00:19 +0000  (12:00 +0800)] 
crimson/os: drop seastore_perf_counters.hSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 04:40:10 +0000  (12:40 +0800)] 
crimson/tools/store_nbd: remove PerfServiceSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 04:32:39 +0000  (12:32 +0800)] 
crimson/os: do not create PerfService for SeaStoreSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 04:26:15 +0000  (12:26 +0800)] 
crimson/os: move ctor of SeaStore into .ccSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 04:01:56 +0000  (12:01 +0800)] 
crimson/os: replace perfcounter with metrics in SegmentCleanerSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 04:03:27 +0000  (12:03 +0800)] 
crimson/os: register metrics() in TransactionManager's ctor
this change should have been a part of
2356da856784e78750ba7f3b381b31b1c8ad5672 
also do not include the unused header file
Signed-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 03:56:34 +0000  (11:56 +0800)] 
crimson/os: move ctor of SegmentCleaner into .ccSigned-off-by: Kefu Chai <kchai@redhat.com> 
Samuel Just  [Thu, 20 May 2021 04:15:40 +0000  (21:15 -0700)] 
Merge pull request #41423 from athanatos/sjust/wip-lba-merge-fixReviewed-by: Chunmei Liu <chunmei.liu@intel.com> 
Kefu Chai  [Thu, 20 May 2021 01:04:33 +0000  (09:04 +0800)] 
Merge pull request #41392 from tchaikov/wip-libradosReviewed-by: Neha Ojha <nojha@redhat.com> 
Josh Durgin  [Thu, 20 May 2021 00:42:21 +0000  (17:42 -0700)] 
Merge pull request #41409 from zdover23/wip-doc-security-2021-05-19-fifth-itemReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Josh Durgin  [Thu, 20 May 2021 00:41:38 +0000  (17:41 -0700)] 
Merge pull request #41410 from zdover23/wip-doc-security-2021-05-19-seventh-itemReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Samuel Just  [Thu, 20 May 2021 00:11:02 +0000  (17:11 -0700)] 
Merge pull request #41424 from athanatos/sjust/wip-interruptor-unittest-nameReviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com> Reviewed-by: Xuehan Xu <xuxuehan@360.cn> 
Kefu Chai  [Thu, 20 May 2021 00:10:11 +0000  (08:10 +0800)] 
Merge pull request #41425 from athanatos/sjust/wip-seastore-buildReviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Samuel Just  [Wed, 19 May 2021 21:41:06 +0000  (14:41 -0700)] 
crimson/tools/store_nbd/tm_driver: remove perfcounter argumentSigned-off-by: Samuel Just <sjust@redhat.com> 
Samuel Just  [Wed, 19 May 2021 21:40:42 +0000  (14:40 -0700)] 
crimson/os/seastore/logging: fix log() argumentSigned-off-by: Samuel Just <sjust@redhat.com> 
Samuel Just  [Wed, 19 May 2021 21:07:46 +0000  (14:07 -0700)] 
test/crimson/CMakeLists.txt: fix name of unittest-interruptible-futureSigned-off-by: Samuel Just <sjust@redhat.com> 
Samuel Just  [Sat, 8 May 2021 02:42:47 +0000  (02:42  +0000)] 
crimson/.../lba_btree_node_impl: handle relative addr in mergeSigned-off-by: Samuel Just <sjust@redhat.com> 
Josh Durgin  [Wed, 19 May 2021 20:15:37 +0000  (13:15 -0700)] 
Merge pull request #40836 from kamoltat/wip-autoscaler-new-alg-turn-on-offReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Kamoltat  [Tue, 13 Apr 2021 21:12:40 +0000  (21:12 +0000)] 
pybind/mgr/pg_autoscaler: Added autoscale-profile featureSigned-off-by: Kamoltat <ksirivad@redhat.com> 
Zac Dover  [Wed, 19 May 2021 14:44:00 +0000  (00:44  +1000)] 
doc/security: enrich seventh listitemSigned-off-by: Zac Dover <zac.dover@gmail.com> 
Josh Durgin  [Wed, 19 May 2021 14:40:59 +0000  (07:40 -0700)] 
Merge pull request #41406 from zdover23/wip-doc-security-2021-05-19-first-itemReviewed-by: Josh Durgin <jdurgin@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Zac Dover  [Wed, 19 May 2021 14:37:52 +0000  (00:37  +1000)] 
doc/security: updating fifth listitemSigned-off-by: Zac Dover <zac.dover@gmail.com> 
Kefu Chai  [Wed, 19 May 2021 14:13:15 +0000  (22:13 +0800)] 
Merge pull request #41391 from tchaikov/wip-libcephfsReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 14:12:24 +0000  (22:12 +0800)] 
Merge pull request #41359 from tchaikov/wip-cmake-cleanupReviewed-by: Sebastian Wagner <sewagner@redhat.com> 
Zac Dover  [Wed, 19 May 2021 14:07:45 +0000  (00:07  +1000)] 
doc/security: removing pleonasmSigned-off-by: Zac Dover <zac.dover@gmail.com> 
Kefu Chai  [Wed, 19 May 2021 13:19:11 +0000  (21:19 +0800)] 
Merge pull request #41355 from tchaikov/wip-doc-rgw-confReviewed-by: Casey Bodley <cbodley@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 12:38:07 +0000  (20:38 +0800)] 
Merge pull request #41399 from idryomov/wip-mrun-if-posixReviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 12:37:44 +0000  (20:37 +0800)] 
Merge pull request #41393 from rosinL/fix-50835Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Sun, 16 May 2021 03:54:19 +0000  (11:54 +0800)] 
doc/radosgw: use confval directive to define optionsSigned-off-by: Kefu Chai <kchai@redhat.com> 
Sage Weil  [Wed, 19 May 2021 11:57:20 +0000  (07:57 -0400)] 
Merge PR #41388 into masterReviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: Sebastian Wagner <swagner@suse.com> 
Sage Weil  [Wed, 19 May 2021 11:55:30 +0000  (07:55 -0400)] 
Merge PR #41286 into masterReviewed-by: Sébastien Han <seb@redhat.com> 
Sage Weil  [Wed, 19 May 2021 11:52:17 +0000  (07:52 -0400)] 
Merge PR #41370 into masterReviewed-by: Daniel Pivonka <dpivonka@redhat.com> Reviewed-by: Adam King <adking@redhat.com> Reviewed-by: Michael Fritch <mfritch@suse.com> 
Ernesto Puerta  [Wed, 19 May 2021 11:43:42 +0000  (13:43 +0200)] 
Merge pull request #41345 from rhcs-dashboard/fix-CVE-2021-3509-masterReviewed-by: Alfonso Martínez <almartin@redhat.com> Reviewed-by: Laura Paduano <lpaduano@suse.com> Reviewed-by: Ernesto Puerta <epuertat@redhat.com> Reviewed-by: Nizamudeen A <nia@redhat.com> 
Ilya Dryomov  [Wed, 19 May 2021 11:00:16 +0000  (13:00 +0200)] 
mrun: avoid == in [ commandSigned-off-by: Ilya Dryomov <idryomov@gmail.com> 
Ernesto Puerta  [Wed, 19 May 2021 10:41:33 +0000  (12:41 +0200)] 
Merge pull request #41104 from rhcs-dashboard/fix-ESOCKETTIMEDOUT-e2e-failureReviewed-by: Aashish Sharma <aasharma@redhat.com> Reviewed-by: Alfonso Martínez <almartin@redhat.com> Reviewed-by: Avan Thakkar <athakkar@redhat.com> Reviewed-by: Ernesto Puerta <epuertat@redhat.com> Reviewed-by: Nizamudeen A <nia@redhat.com> 
Ernesto Puerta  [Wed, 19 May 2021 10:40:02 +0000  (12:40 +0200)] 
Merge pull request #41273 from rhcs-dashboard/update-frontend-depsReviewed-by: Waad Alkhoury <walkhour@redhat.com> Reviewed-by: Alfonso Martínez <almartin@redhat.com> Reviewed-by: Avan Thakkar <athakkar@redhat.com> Reviewed-by: Ernesto Puerta <epuertat@redhat.com> Reviewed-by: Nizamudeen A <nia@redhat.com> 
luo rixin  [Wed, 19 May 2021 02:27:18 +0000  (10:27 +0800)] 
common/crc32c_aarch64: fix crc32c unittest failed on aarch64Fixes: https://tracker.ceph.com/issues/50835 Signed-off-by: luo rixin <luorixin@huawei.com> 
Sage Weil  [Tue, 18 May 2021 12:23:36 +0000  (08:23 -0400)] 
cephadm: write config files as utf-8Signed-off-by: Sage Weil <sage@newdream.net> 
Kefu Chai  [Wed, 19 May 2021 01:30:08 +0000  (09:30 +0800)] 
include/rados/librados.h: use UINT64_C to define constantsSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 01:18:33 +0000  (09:18 +0800)] 
libcephfs: include <sys/time.h>Signed-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 19 May 2021 00:47:34 +0000  (08:47 +0800)] 
Merge pull request #41390 from batrick/i50865Reviewed-by: Kefu Chai <kchai@redhat.com> 
Patrick Donnelly  [Tue, 18 May 2021 20:43:28 +0000  (13:43 -0700)] 
Merge PR #41357 into masterReviewed-by: Jeff Layton <jlayton@redhat.com> Reviewed-by: Venky Shankar <vshankar@redhat.com> 
Patrick Donnelly  [Tue, 18 May 2021 20:42:47 +0000  (13:42 -0700)] 
Merge PR #41347 into masterReviewed-by: Jeff Layton <jlayton@redhat.com> Reviewed-by: Xiubo Li <xiubli@redhat.com> 
Patrick Donnelly  [Tue, 18 May 2021 20:42:09 +0000  (13:42 -0700)] 
Merge PR #41332 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 18 May 2021 20:41:28 +0000  (13:41 -0700)] 
Merge PR #41171 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 18 May 2021 20:40:45 +0000  (13:40 -0700)] 
Merge PR #41097 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> Reviewed-by: Sébastien Han <seb@redhat.com> 
Patrick Donnelly  [Tue, 18 May 2021 20:36:05 +0000  (13:36 -0700)] 
Merge PR #40885 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 18 May 2021 20:20:20 +0000  (13:20 -0700)] 
Merge PR #41371 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Sage Weil  [Tue, 18 May 2021 18:37:32 +0000  (13:37 -0500)] 
qa/suites/orch/rook: disable centos for now
We are hitting an selinux denial:
type=AVC msg=audit(
1621353663 .595:6016): avc: denied { write } for pid=28812 comm="cephcsi" name="pids.max" dev="cgroup" ino=2933 scontext=system_u:system_r:container_t:s0:c43,c177 tcontext=system_u:object_r:cgroup_t:s0 tclass=file permissive=1
Signed-off-by: Sage Weil <sage@newdream.net> 
Sage Weil  [Fri, 14 May 2021 15:45:00 +0000  (10:45 -0500)] 
qa/suites/orch/rook/smoke: initial smoke suiteSigned-off-by: Sage Weil <sage@newdream.net> 
Sage Weil  [Tue, 18 May 2021 14:54:42 +0000  (09:54 -0500)] 
qa/tasks/rook: ROOK_HOSTPATH_REQUIRES_PRIVILEGED=true on centosSigned-off-by: Sage Weil <sage@newdream.net> 
Sage Weil  [Tue, 18 May 2021 14:54:15 +0000  (09:54 -0500)] 
qa/tasks/rook: simplify shutdownSigned-off-by: Sage Weil <sage@newdream.net> 
Sage Weil  [Tue, 18 May 2021 14:53:39 +0000  (09:53 -0500)] 
qa/tasks/rook: archive logsSigned-off-by: Sage Weil <sage@newdream.net> 
Sage Weil  [Tue, 18 May 2021 13:57:12 +0000  (08:57 -0500)] 
qa/tasks/rook: more orderly cluster teardownSigned-off-by: Sage Weil <sage@newdream.net> 
Sage Weil  [Thu, 13 May 2021 14:26:35 +0000  (09:26 -0500)] 
qa/tasks/rook: deploy ceph via rook on top of kubernetesFixes: https://tracker.ceph.com/issues/47507 Signed-off-by: Sage Weil <sage@newdream.net> 
Patrick Donnelly  [Tue, 18 May 2021 18:13:00 +0000  (11:13 -0700)] 
doc: use sphinx .dot includeSigned-off-by: Patrick Donnelly <pdonnell@redhat.com> 
Josh Durgin  [Tue, 18 May 2021 17:56:05 +0000  (10:56 -0700)] 
Merge pull request #40921 from kamoltat/wip-pool-start-out-with-1-pgReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Sage Weil  [Tue, 18 May 2021 16:23:48 +0000  (12:23 -0400)] 
Merge PR #41383 into masterReviewed-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 7 May 2021 18:24:31 +0000  (13:24 -0500)] 
qa/tasks/kubeadm: install kubernetes with kubeadmSigned-off-by: Sage Weil <sage@newdream.net> 
Sage Weil  [Fri, 14 May 2021 15:40:02 +0000  (10:40 -0500)] 
qa/suites: move rados/cephadm -> orch/cephadm; symlinkSigned-off-by: Sage Weil <sage@newdream.net> 
Kefu Chai  [Tue, 18 May 2021 15:37:22 +0000  (23:37 +0800)] 
Merge pull request #41352 from tchaikov/wip-crimson-metricsReviewed-by: Amnon Hanuhov <ahanukov@redhat.com> Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com> Reviewed-by: Samuel Just <sjust@redhat.com> 
Sunny Kumar  [Fri, 14 May 2021 11:09:17 +0000  (12:09 +0100)] 
qa/workunits/rbd-nbd: add new test for map/unmapSigned-off-by: Sunny Kumar <sunkumar@redhat.com> 
Ernesto Puerta  [Tue, 18 May 2021 15:22:02 +0000  (17:22 +0200)] 
Merge pull request #41377 from rhcs-dashboard/change-password-preserve-url-fixReviewed-by: Alfonso Martínez <almartin@redhat.com> Reviewed-by: Ernesto Puerta <epuertat@redhat.com> Reviewed-by: Nizamudeen A <nia@redhat.com> 
Sage Weil  [Mon, 17 May 2021 21:23:48 +0000  (16:23 -0500)] 
qa/tasks/cephadm: add whitespace between functionsSigned-off-by: Sage Weil <sage@newdream.net> 
Ronen Friedman  [Sat, 15 May 2021 19:14:38 +0000  (22:14 +0300)] 
test: recovery_scrub: do not display 'repair' status on auto-repair deep-scrubSigned-off-by: Ronen Friedman <rfriedma@redhat.com> 
Hardik Vyas  [Tue, 18 May 2021 12:13:53 +0000  (17:43 +0530)] 
doc/security: Add single GPG key in lieu of existing three GPG keysSigned-off-by: Hardik Vyas <hvyas@redhat.com> 
Sage Weil  [Tue, 18 May 2021 13:32:52 +0000  (09:32 -0400)] 
Merge PR #40640 into masterReviewed-by: Juan Miguel Olmo <jolmomar@redhat.com> 
Rishabh Dave  [Tue, 18 May 2021 12:50:43 +0000  (18:20 +0530)] 
Merge pull request #39580 from ifed01/wip-ifed-migrate
Kefu Chai  [Tue, 18 May 2021 12:29:40 +0000  (20:29 +0800)] 
doc/dev/msgr2: add state machine diagramsSigned-off-by: Kefu Chai <kchai@redhat.com> 
Sage Weil  [Mon, 17 May 2021 19:40:10 +0000  (15:40 -0400)] 
mgr/cephadm: pin haproxy image to 2.3.z
The 2.4 version fails for reasons that aren't immediate clear:
May 17 15:28:42 dael conmon[
3007013 ]: [NOTICE]   (8) : haproxy version is 2.4.0-
6cbbecf 
May 17 15:28:42 dael conmon[
3007013 ]: [NOTICE]   (8) : path to executable is /usr/local/sbin/haproxy
May 17 15:28:42 dael conmon[
3007013 ]: [ALERT]    (8) : Cannot open configuration file/directory /var/lib/haproxy/haproxy.cfg : Permission denied
Even with mode 777 on those files, there is an error about the chroot to
/var/lib/haproxy.
For now, just stick with a working version.
Fixes: https://tracker.ceph.com/issues/50830 
Signed-off-by: Sage Weil <sage@newdream.net> 
Matt Benjamin  [Tue, 18 May 2021 12:19:09 +0000  (08:19 -0400)] 
Merge pull request #41282 from cbodley/wip-rgw-rm-civetweb
Kefu Chai  [Sat, 15 May 2021 08:55:49 +0000  (16:55 +0800)] 
crimson/admin: reindent SeastarMetricsHookSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Sat, 15 May 2021 06:35:31 +0000  (14:35 +0800)] 
crimson/admin: add optional prefix arg to "perf dump_seastar"Signed-off-by: Kefu Chai <kchai@redhat.com>