1
0
mirror of https://github.com/ceph/ceph synced 2024-12-24 12:24:19 +00:00
Commit Graph

1030 Commits

Author SHA1 Message Date
Sage Weil
c4a7881876
Merge pull request from liewegas/wip-kill-crush-location
ceph-crush-location: remove

Reviewed-by: Wido den Hollander <wido@widodh.nl>
2018-01-11 15:48:29 -06:00
Kefu Chai
218df657d4
Merge pull request from thmour/master
ceph-volume: Require lvm2, move to osd package

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-01-10 23:28:52 +08:00
Sage Weil
fb3220ff3e ceph-crush-location: remove
This script is pointless.  It is equivalent to the built-in default
behavior, which makes it only useful as a sample for what a location
hook's output should be.  The documentation has been updated to provide
that.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-01-09 16:38:12 -06:00
Casey Bodley
b589b73c70 cmake: add WITH_BOOST_CONTEXT option
adds a more specific option for this boost::context dependency, which was
previously only used by the radosgw beast frontend. see
http://tracker.ceph.com/issues/20048 for more background

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-01-05 14:55:23 -05:00
Theofilos Mouratidis
02bc369e05 ceph-volume: Require lvm2, move to osd package
Fixes: http://tracker.ceph.com/issues/22443

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
2017-12-25 16:52:07 +01:00
John Spray
87399bea83 packaging: explicit jinja2 dependency for dashboard
We were getting this via python-flask, when mgr was
installed on nodes with ceph-mon, but for correctness
in general we should depend on it from ceph-mgr (it
is imported by the dashboard module).

Fixes: http://tracker.ceph.com/issues/22457
Signed-off-by: John Spray <john.spray@redhat.com>
2017-12-19 11:52:29 +00:00
Kefu Chai
809a0ce816 debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move
this is a follow-up of . we need to get this change into 12.2.3.
so better off do the switch somewhere after 12.2.2 which has been
tagged, and before 12.2.3, which is not tagged yet.

please note, this is not targetting master, because i want to make
sure the change number (the <num> in << 12.2.2-<num>) is correct. it
does not hurt if it's not, as long as it is ">> 12.2.2", so the replace
machinery in 12.2.3 works, and it covers the releases where the
ceph-{osdomap,kvstore,monstore}-tool are not move yet. but why don't
make it more right?

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit cdf49ba664)
2017-12-08 14:51:08 +08:00
Sage Weil
9271d52851 debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move
The backport didn't make 12.2.2, but it will be in 12.2.3.

Fixes: http://tracker.ceph.com/issues/22319
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e0c814266f)
2017-12-08 14:51:08 +08:00
Kefu Chai
b3ceafe7d8 cmake,rpm,deb: update to accommodate SPDK v17.10
* cmake/modules/BuildSPDK.cmake: add lvol
* cmake/modules/BuildDPDK.cmake: add pci and bus_pci
* ceph.spec.in, cmake/modules/BuildSPDK.cmake, debian/control:
  re-introduce libuuid dependency, as 17.07 added lvol. and the latter
  depends on uuid.
* cmake/modules/BuildSPDK.cmake: avoid introducing local variable of
  `iface_libs`.
* cmake/modules/patch-dpdk-conf.sh: disable
  CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES, this option introduces the
  balanced allocation of memory. but it also requires libnuma-dev.
  let's disable it for now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-29 18:03:23 +08:00
Kefu Chai
586da3da4f
Merge pull request from ddiss/pid_max
sysctl.d: set kernel.pid_max=4194304

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-20 14:37:08 +08:00
David Disseldorp
4d0b700688 sysctl: relocate 90-ceph-osd.conf under etc/sysctl/
Signed-off-by: David Disseldorp <ddiss@suse.de>
2017-11-17 14:40:23 +01:00
Kefu Chai
22d8dde1d5 rpm,deb: add cunit1 as build dependency
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-17 15:40:00 +08:00
Kefu Chai
c8d4005558 cmake,deb: remove the last trace of atomic_ops
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-03 16:23:42 +08:00
Kefu Chai
e90916dd77 Merge pull request from chenliuzhong/change-aio-max-nr
ceph.spec.in,debian/rules: change aio-max-nr to 1048576

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-25 13:25:24 +08:00
Alfredo Deza
72dba6c716 Merge pull request from tchaikov/wip-doc-cleanup
doc: various cleanups

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-10-24 07:03:29 -04:00
Kefu Chai
e479bd0ac1 rpm,debian: use download.ceph.com/tarballs instead of ceph.com/download
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-24 16:00:09 +08:00
chenliuzhong
36326dc710 ceph.spec.in,debian/rules: change aio-max-nr to 1048576
when osd is more than 14 in one host,it report error that aio is not enough.
As the default aio-max-nr is 65536, one OSD needs 4096 aios and other programs may use aios.
This patch change aio-max-nr to 1048576 when install ceph-osd rpm package and debian package

Signed-off-by: chenliuzhong <liuzhong.chen@easystack.cn>
2017-10-24 13:16:36 +08:00
Kefu Chai
ed988fc660 debian: fix package relationships after d3ac8d18
d3ac8d18 moves ceph-client-debug from ceph-test to ceph-base without
updating the package relationships between the two involved packages.
which results in:

dpkg: error processing archive /var/cache/apt/archives/ceph-test_12.2.1-241-g43e027b-1trusty_amd64.deb (--unpack):
 trying to overwrite '/usr/bin/ceph-client-debug', which is also in package ceph-base 10.2.10-14-gcbaddae-1trusty
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-23 20:18:15 +08:00
Kefu Chai
50dad805d9 debian: fix package relationships after 40caf6a6
we have issues when running upgrade tests:

dpkg: error processing archive /var/cache/apt/archives/ceph-osd_13.0.0-2201-g6cc0b41-1trusty_amd64.deb (--unpack):
trying to overwrite '/usr/bin/ceph-osdomap-tool', which is also in package ceph-test 10.2.10-14-gcbaddae-1trusty

in 40caf6a6, we moves some tools from ceph-test out into ceph-osd,
ceph-mon and ceph-base respectively. but didn't update the relationships
between these packages accordingly. this causes the upgrade failure.

see https://www.debian.org/doc/debian-policy/#document-ch-relationships
for more details on "Breaks" and "Conflicts".

the reason why the package version to be replaced/conflicted is 12.2.2
is that: i assume that this change will be backported to luminous, and
the next release of it will be 12.2.2 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-23 20:18:14 +08:00
Kefu Chai
21cf1eb4fd Merge pull request from liewegas/wip-bluestore-superblock
os/bluestore: allow reconstruction of osd data dir from bluestore bdev label

Reviewed-By: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-19 13:51:18 +08:00
Sage Weil
7b91e50dbd doc/man/8/ceph-bluestore-tool: add man page
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 14:29:10 -05:00
Nathan Cutler
40caf6a6d8 build/ops: deb: move ceph-*-tool binaries out of ceph-test subpackage
ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into the ceph-base subpackage

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-10-16 17:39:14 +02:00
Sage Weil
c3a53010af debian/rules: no more ChangeLog
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-28 14:33:15 -04:00
Sage Weil
2d98708135 rpm,deb: package ceph-kvstore-tool man page
Signed-off-by: Sage Weil <sage@redhat.com>
2017-08-31 11:58:11 +08:00
Alfredo Deza
a20015636c debian: include ceph-volume and ceph-volume-systemd man pages
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-22 11:20:47 -04:00
Alfredo Deza
60eb0e58d9 Merge pull request from ceph/wip-bz1478599
ceph-volume: Use a delimited CLI output parser instead of JSON

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-08-21 16:52:10 -04:00
Alfredo Deza
05493ebaab debian: include ceph-volume-systemd CLI tool
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-21 13:02:33 -04:00
Kefu Chai
257718556f Merge pull request from squidboylan/fix_15872
debian: lock ceph user during purge

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-20 10:16:43 +08:00
Sage Weil
0b5267e428 Merge pull request from liewegas/wip-20915
rpm,deb: fix ceph-volume

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2017-08-06 13:41:21 -05:00
Sage Weil
f766842fcf Merge pull request from dillaman/wip-bootstrap-rbd-mirror
mon: added bootstrap-rbd auth profile

Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-05 13:27:32 -05:00
Sage Weil
de4ddb63a2 debian: include ceph-volume python
Be careful not to grab ceph_volume_client.py

Signed-off-by: Sage Weil <sage@redhat.com>
2017-08-04 15:47:47 -04:00
Alfredo Deza
31524efd1d build: add deb install rule for ceph-volume executable
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-04 10:25:57 -04:00
Alfredo Deza
7ca7b04521 build: add deb rules for ceph-volume systemd service file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-04 10:25:57 -04:00
Jenkins Build Slave User
b661348f15 12.1.2 2017-08-01 17:55:40 +00:00
Jason Dillaman
bedd712840 mon: new bootstrap-rbd auth profile
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-27 14:07:00 -04:00
Sage Weil
6b2458065e deb,rpm: require socat for ceph-test
Used by qa/standalone/mon/mon-bind.sh.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-24 15:44:51 -04:00
Jenkins Build Slave User
f3e663a190 12.1.1 2017-07-17 16:56:02 +00:00
Bassam Tabbara
a8da9fd077 test,qa/workunits: add tests for public_bind_addr
Add a set of new tests for the case when public_addr and public_bind_addr
are different for a mon. In order to test this properly I had to employ
port forwarding with socat. This helps simulate what would happen in a
environment like Kubernetes. socat is now a build dependency.

Also, moved jq_success to ceph-helpers.sh and refactored run_mon to enable
creating the mons without creating the rbd pool immediately.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
2017-07-14 10:41:49 -07:00
Sage Weil
67aa4e8137 Merge pull request from javacruft/ubuntu-fix-systemd-enable
build: execute dh_systemd_{enable,start} after dh_install

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-07 16:48:14 -05:00
Sage Weil
8b08bd580d Merge remote-tracking branch 'gh/luminous' 2017-07-07 14:19:47 -04:00
James Page
8d0ebe217c build: execute dh_systemd_{enable,start} after dh_install
Ensure that dh_systemd_* debhelpers are executed after dh_install
has installed the systemd unit and target definitions.

This ensures that targets are enabled by default once installed,
resolving issues with startup of ceph daemons on server reboot.

Fixes: http://tracker.ceph.com/issues/19585
Signed-off-by: James Page <james.page@ubuntu.com>
2017-07-07 17:18:27 +01:00
James Page
1341de99a0 debian: wrap-and-sort all files
'wrap-and-sort -a -t' debian folder to apply consistent
ordering/formatting to all files.

This makes synchronization of debian package changes
between Ceph packages and Ubuntu packages easier to
manage.

Signed-off-by: James Page <james.page@ubuntu.com>
2017-07-04 17:38:39 +01:00
Kefu Chai
c90f0605b6 debian: workaround the bug in dpkg-maintscript-helper
see https://bugs.launchpad.net/ubuntu/+source/snap-confine/+bug/1605052
and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582819

Fixes: http://tracker.ceph.com/issues/20453
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-03 16:51:24 +08:00
Caleb Boylan
114f43a58a build/ops: Lock ceph user during a purge
Signed-off-by: Caleb Boylan <calebboylan@gmail.com>
2017-06-23 15:44:16 -07:00
Jenkins Build Slave User
262617c9f1 12.1.0 2017-06-22 15:43:50 +00:00
Boris Ranto
4dc471ed60 restful: Introduce create-self-signed-cert command
This implements a create-self-signed-cert command for the ceph-mgr
restful interface.

It is designed so that it will try to restart the module once the cert
is created.

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-06-21 12:32:49 -04:00
Sage Weil
de026f15f8 ceph.spec,debian: remove auto-generated self-signed mgr restful cert
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-20 17:25:05 -04:00
Nathan Cutler
c43bbd8df0 build/ops: drop sample.fetch_config
smithfarm: @liewegas Is src/fetch_config still needed?
liewegas: i don't think so

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-15 13:30:49 +02:00
Nathan Cutler
0f2f7d60a2 build/ops: rpm, COPYING: drop GPL 2.0 with Autoconf Exception
This license is no longer used.

Fixes: http://tracker.ceph.com/issues/20091
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-14 12:15:47 +02:00
Sage Weil
f3904aad0c Merge pull request from ceph/luminous
12.0.3
2017-06-09 09:13:59 -05:00