1
0
mirror of https://github.com/ceph/ceph synced 2024-12-26 13:33:57 +00:00
Commit Graph

100403 Commits

Author SHA1 Message Date
Kefu Chai
bbb69fe793 cmake: require CMake v3.10.2
since we dropped the support of xenial, we now have the luxury of using
newer CMake! and by using CMake 3.10.2, we can prevent libfmt from
assuming that we are using C++11, and hence set `CMAKE_CXX_STANDARD` to
11, which will literally append `-std=gnu++11` to `CMAKE_CXX_FLAGS`.
the last `-std` option passed to `g++` takes precendence.
since we've switched over to C++17, and we are using C++17 features.
so, using cmake older than 3.8 breaks the build. because it is CMake 3.8
which stared support `CMAKE_CXX_STANDARD` 17.

- for bionic: https://packages.ubuntu.com/bionic/cmake : 3.10.2
- for CentOS7:
https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ : 3.13.5

so in this change,

* bump up the required version to v3.10.2
* cleanups to wipe out the workaround for lower CMake versions
* use `PROJECT_VERSION` defined by `project()` command instead of
  `VERSION` explicitly defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-02 22:09:12 +08:00
Kefu Chai
ddacfcc0e0 install-deps.sh: install cmake 3.10.2 and up on xenial
to enable us to build on xenial, install newer cmake.
cmake 3.10.2 is the version offered by bionic.

with this change, we can safely require cmake 3.10.2 in our cmake
script. as EPEL7 offers cmake 3.13

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-02 20:23:33 +08:00
Jan Fajerski
45a4d53012
Merge pull request from jan--f/c-v-inventory-parttype
ceph-volume: detect ceph-disk osd if PARTLABEL is missing
2019-08-02 11:17:17 +02:00
Ricardo Dias
29edead1c6
Merge pull request from p-na/wip-pna-disable-user
mgr/dashboard: Provide user enable/disable capability

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-08-02 10:05:21 +01:00
Ricardo Dias
1fb9c64692
Merge pull request from votdev/issue_24662
mgr/dashboard: Allow disabling redirection on standby Dashboards

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2019-08-02 10:02:38 +01:00
Sage Weil
647d80437b Merge PR into master
* refs/pull/29379/head:
	os/bluestore: s/align_down/p2align/

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-08-02 01:19:57 -05:00
Sage Weil
e8bca54f4e Merge PR into master
* refs/pull/28881/head:
	os/Transaction: dump alloc hint flags in op

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-08-02 01:17:48 -05:00
Kefu Chai
0e35c6f641
Merge pull request from smithfarm/wip-40975
rpm: put librgw lttng SOs in the librgw-devel package

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-08-02 11:52:07 +08:00
Kefu Chai
8d497f1ed2
Merge pull request from wjwithagen/wjw-fix-malloc.h
common: use of malloc.h is deprecated

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-08-02 11:50:29 +08:00
Kefu Chai
95fd792be1
Merge pull request from wjwithagen/wjw-fix-boost-1.70
cmake: update FindBoost.cmake

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-08-02 11:49:34 +08:00
J. Eric Ivancich
b4e4acb213
Merge pull request from liewegas/wip-rgw-meta-pool-priority
rgw: add rgw_rados_pool_recovery_priority (default 5)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-08-01 20:46:39 -04:00
J. Eric Ivancich
61fc5c7df5
Merge pull request from zhangsw/rgw-bugfix-versioning
rgw: fix a bug that lifecycle expiraton generates delete marker continuously

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-08-01 19:33:40 -04:00
J. Eric Ivancich
fa0dd4003d
Merge pull request from taodd/rgw-fix-remove-bucket
rgw: fix drain handles error when deleting bucket with bypass-gc option

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2019-08-01 19:30:43 -04:00
J. Eric Ivancich
a9a3e59abc
Merge pull request from ivancich/wip-small-rgw-efficiency
rgw: add a small efficiency

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-08-01 18:36:30 -04:00
J. Eric Ivancich
092ef6085c
Merge pull request from ivancich/wip-bucket-list-excessive-max-entries
rgw: mitigate bucket list with max-entries excessively high

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-08-01 18:34:35 -04:00
J. Eric Ivancich
0ef6bee2d5
Merge pull request from mdw-at-linuxbox/wip-master-rgw-swift-metadata-versioning
rgw: Fix bucket versioning vs. swift metadata bug.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
2019-08-01 18:28:19 -04:00
Matt Benjamin
57df918a1a
Merge pull request from linuxbox2/wip-rgw-uinfo-by-acc
rgw: permit rgw-admin to populate user info by access-key
2019-08-01 16:07:34 -04:00
Kefu Chai
d835e9a926
Merge pull request from tchaikov/wip-remove-test/python
test/python: remove stale tests

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2019-08-02 00:38:28 +08:00
Jason Dillaman
8c69bf7cb1
Merge pull request from ricardoasmarques/fix-doc-rbd-namespace
doc: Fix rbd namespace documentation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-08-01 12:03:25 -04:00
Ricardo Marques
029dade640 doc: Fix rbd namespace documentation
Pool and namespace should be separated by a slash.

Fixes: https://tracker.ceph.com/issues/41046

Signed-off-by: Ricardo Marques <rimarques@suse.com>
2019-08-01 15:45:24 +01:00
Kefu Chai
b6da01e75f
Merge pull request from tchaikov/wip-cmake-tox-test
cmake: add add_tox_test()

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-08-01 22:04:30 +08:00
Kefu Chai
821050f3b1
Merge pull request from rhcs-dashboard/wip-41023-master
doc: Show Jenkins commands

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-08-01 21:43:15 +08:00
Kefu Chai
1792ab404b
Merge pull request from iotcg/starlingx
ceph-objectstore-tool: set log date format

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-08-01 21:41:06 +08:00
Jan Fajerski
82d2ae7ffd ceph-volume: fall back to PARTTYPE if PARTLABEL is empty
In some cases ceph-disk does not populate PARTLABEL for wal and db
partitions. This commit adds the assumption that the empty string is a
valid label and falls back to identifying those disks by PARTTYPE.

Fixes: https://tracker.ceph.com/issues/40917

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-08-01 15:35:30 +02:00
Jan Fajerski
bb29110c3c ceph-volume: adjust tests for empty PARTLABEL fields
It seems like ceph-disk sometimes creates OSDs where the wal and db
partitions have no PARTLABEL set. This commit alters tests so that the
empty string is considered a valid label.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-08-01 15:35:25 +02:00
Kefu Chai
b9c9f74f06 cmake: add add_tox_test()
to consolidate the tox tests

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-01 21:33:30 +08:00
Abhishek L
067db76a4c
Merge pull request from capri1989/doc-pg-num
doc: pg_num should always be a power of two

Reviewed-By: Jan Fajerski <jfajerski@suse.com>
Reviewed-By: Sage Weil <sage@redhat.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
2019-08-01 14:18:53 +02:00
Ricardo Dias
566421798e
mgr/dashboard: removing dead code in upgrade user database
Signed-off-by: Ricardo Dias <rdias@suse.com>
2019-08-01 09:35:05 +01:00
Ricardo Dias
a86850c3f3
mgr/dashboard: tests: fix test_access_control due to the merge of 79b9021
Signed-off-by: Ricardo Dias <rdias@suse.com>
2019-08-01 09:34:56 +01:00
Ricardo Dias
c84eb40024
mgr/dashboard: frontend: use checkIcon for enabled column in user list
Signed-off-by: Ricardo Dias <rdias@suse.com>
2019-08-01 09:34:53 +01:00
Ricardo Dias
4ce3b5868d
mgr/dashboard: frontend: use checkbox for enabled field in user form
Signed-off-by: Ricardo Dias <rdias@suse.com>
2019-08-01 09:34:53 +01:00
Patrick Nawracay
a2a5457a03
mgr/dashboard: Provide user enable/disable capability in the frontend
Fixes: http://tracker.ceph.com/issues/25229

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
2019-08-01 09:34:53 +01:00
Patrick Nawracay
2b76d76904
mgr/dashboard: Provide user enable/disable capability in the backend
Fixes: http://tracker.ceph.com/issues/25229

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
2019-08-01 09:34:53 +01:00
Sebastian Wagner
1a3a1d1310
Merge pull request from sebastian-philipp/orchestrator-get_feature_set
mgr/orchestrator: Split *_stateless_service and add get_feature_set
2019-08-01 09:37:16 +02:00
Sebastian Wagner
a74fc09b16
Merge pull request from sebastian-philipp/rook-caching
mgr/rook: Add caching for the Dashboard

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
2019-08-01 09:35:21 +02:00
Sage Weil
9edfc9578f Merge PR into master
* refs/pull/29334/head:
	qa/tasks/mgr/dashboard/test_mgr_module: adjust expected schema
	mgr/telemetry: separate out cluster config vs running daemons
	mgr/telemetry: include any config options that are customized

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
2019-07-31 20:27:27 -05:00
Sage Weil
76885c1a13 Merge PR into master
* refs/pull/29340/head:
	mgr/telemetry: specify license when opting in

Reviewed-by: Wido den Hollander <wido@42on.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
2019-07-31 20:27:06 -05:00
Jason Dillaman
838430e1f1
Merge pull request from vshankar/wip-fix-rbd-support
pybind/rbd: fix call to unregister_osd_perf_queries

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-07-31 17:30:54 -04:00
Yuri Weinstein
a319023d09
Merge pull request from yuriw/wip-yuriw-upgrade-rwg-master_2
qa/tests: added rgw into upgrade sequence to improve coverage
2019-07-31 12:32:49 -07:00
Yuri Weinstein
803b8fb752
Merge pull request from yuriw/wip-yuriw-crontab-master
qa/tests: added mimic-x on master run
2019-07-31 12:32:24 -07:00
Patrick Donnelly
9e106f1422
Merge PR into master
* refs/pull/29104/head:
	qa/cephfs: test case for timeout config of individual session
	mds: add command that config individual client session

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-07-31 12:06:39 -07:00
Casey Bodley
ff13529790
Merge pull request from uweigand/fix-no-boost-context-build
rgw: tests: Fix building with -DWITH_BOOST_CONTEXT=OFF

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-07-31 15:00:17 -04:00
Patrick Donnelly
fc2bb44fbd
Merge PR into master
* refs/pull/29412/head:
	doc: mds-config-ref: update 'mds_log_max_segments' value.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-07-31 11:59:22 -07:00
Patrick Donnelly
a6066f4214
Merge PR into master
* refs/pull/29355/head:
	mgr/volumes: set uid/gid of FS client's mount as 0/0

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-07-31 11:33:36 -07:00
Ricardo Dias
a8840f6d97
Merge pull request from ricardoasmarques/prevent-iscsi-target-delete-with-sessions
mgr/dashboard: Prevent deletion of iSCSI IQNs with open sessions

Reviewed-by: Ricardo Dias <rdias@suse.com>
2019-07-31 18:59:33 +01:00
Patrick Donnelly
837836107c
Merge PR into master
* refs/pull/29388/head:
	qa: sleep briefly after resetting kclient

Reviewed-by: David Galloway <dgallowa@redhat.com>
2019-07-31 10:33:18 -07:00
Patrick Donnelly
3d68e6f0a5
Merge PR into master
* refs/pull/29377/head:
	mds: add perf counter for finisher of MDSRank

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-07-31 10:32:50 -07:00
J. Eric Ivancich
300429c9e9 rgw: mitigate bucket list with max-entries excessively high
When listing a bucket with radosgw-admin, the user can specify the
maximum number of entries. That number can be unreasonably large, and
can affect the performance and memory availability. For example:

    radosgw-admin bucket list --bucket mybucket1 --max-entries=10000000

This has the potential for creating large data structures at multiple
levels in the the call stack of the radosgw(-admin) process,
potentially causing the process to run out of memory. This change
limits the maximum number of entries requested in all but the high
level code to help mitigate this issue.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2019-07-31 13:08:20 -04:00
Yuri Weinstein
f34f96dc4a qa/tests: added rgw into upgrade sequence to improve coverage
added rgw into upgrade sequence to improve coverage - splits
See https://github.com/ceph/ceph/pull/29234 https://github.com/ceph/ceph/pull/29282

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2019-07-31 08:48:03 -07:00
Ulrich Weigand
82d66424b7 rgw: tests: Fix building with -DWITH_BOOST_CONTEXT=OFF
Attempting to build with -DWITH_BOOST_CONTEXT=OFF will result in
a "conflicting declaration" error when building
test/rgw/test_rgw_dmclock_scheduler.cc

Fixed by avoiding the boost/asio/spawn.hpp include in that case.

Signed-off-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
2019-07-31 17:38:23 +02:00