Commit Graph

591 Commits

Author SHA1 Message Date
Sage Weil
9797986697 Merge remote-tracking branch 'gh/next' 2013-08-02 11:54:53 -07:00
Gary Lowell
16adb916cd v0.67-rc3 2013-07-30 14:37:56 -07:00
Sage Weil
e747fa8e32 Revert "Use dh_installinit to install upstart job files"
This reverts commit 251a6a498d.

This includes /etc/init.d/radosgw in the ceph package, which makes it
conflict with radosgw.
2013-07-30 13:31:35 -07:00
Sage Weil
3f5352ac67 Merge pull request #463 from toabctl/upstart-handling
Use dh_installinit to install upstart job files

Reviewed-by: Gaudenz Steinlin <gaudenz@debian.org>
2013-07-29 15:09:19 -07:00
Thomas Bechtold
251a6a498d Use dh_installinit to install upstart job files
Signed-off-by: Thomas Bechtold <thomasbechtold@jpberlin.de>
2013-07-29 14:53:58 +02:00
Sage Weil
ee18322e5b Merge remote-tracking branch 'gh/next' 2013-07-28 16:17:55 -07:00
Sage Weil
dd3b0865e0 Merge pull request #464 from toabctl/fuse-utils-obsolete
Remove fuse-utils from Recommends in debian/control

Reviewed-by: Sage Weil <sage@inktank.com>
2013-07-27 17:34:12 -07:00
Sage Weil
6881ab3b39 debian, rpm: make python-ceph depend on python-requests
For ceph-rest-api.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-27 17:32:49 -07:00
Sage Weil
14a3e2ddce remove unused fiemap code
Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-26 16:58:14 -07:00
Sage Weil
a164f575c1 v0.67-rc2
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJR8GEaAAoJEH6/3V0X7TFtQWcP/2Y1Z+EIZf3a3olq+I60drXD
 lKla+SVNp9tr/i3AZD50HZCfLM/1H94CYdCrF5ZYoidue6KHXGazf/EEoRvwgRUv
 CsVnhHSAI+/4KyCUkYPrbgM7W2PxxdP5yCgZ13qMZAcPvPcqnZRD6pmi9efW11Gz
 C/a4lXDI9yXdcLBcKKcxCC3BCj14bea45Ic+4hMxgEnCBCp/2IDBLTr5RmcCsjIF
 8HtXF/v/8Vf5r4Vutxl93hYWuYSoWNh8vYbM0/zum+Z/5tULJXA/dozc2RtdYsC3
 N+8cND7rw9AmdO2WLaWQIJtshImp44+lkKnzSSBqwD6qhJBC+YBoNUGUPEGkPqG1
 LKn0LinKmbB2XM6uAQt6ccVjeR3bA3RF4T/G6OLjuJwICRRysBLtc0EeSp6NMKFq
 6+3YejwN8FTPhSbQ+K5Pl1VxMy3FT3As4x0bpXGK6qTGN00wmwGtvMFhjjxJpKQh
 3ZKeJiLLEEu5VN+Ro1NfLmCHmsxM8yTcExRBN17eG75v3Yt6bavjpwGIhZ52AeTu
 eTkah0FrVTsakkafuETSFYFw1M+pvoaAnAWnx1KFSg5JUx18nCDhfpEX1S6Ufgzt
 8Hf7xMMDI2gKtxRNYv2vqKPx409yBMG+0yA4StOiKeo7mQSTI/bnKa1FEk3PD4WR
 axO71RlwK8c+G9FnysNj
 =ZhZF
 -----END PGP SIGNATURE-----

Merge tag 'v0.67-rc2' into next

v0.67-rc2
2013-07-25 09:49:32 -07:00
Dan Mick
41930b5e8f ceph.spec.in, debian/control: python-ceph depends on python-flask
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-07-24 16:31:46 -07:00
Gary Lowell
0018b45f3c v0.67-rc2 2013-07-24 16:18:56 -07:00
Thomas Bechtold
c8d66b7a7d Remove fuse-utils from Recommends in debian/control
The package fuse-utils is obsolete and no longer in Debian unstable.
2013-07-24 07:00:58 +02:00
Thomas Bechtold
8814265f08 Enable libs3 support for debian packages 2013-07-23 21:09:37 +02:00
Gary Lowell
835dd97301 v0.67-rc1 2013-07-22 11:57:27 -07:00
Dan Mick
1f8fe709b6 ceph-rest-api: Missing packaging (binary in .spec, manpage in both)
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-07-11 18:25:44 -07:00
Dan Mick
4cb0e06266 Add 'ceph-rest-api'
ceph-rest-api is a Python WSGI module for accessing the Ceph cluster.
It supports most of the commands supported by the ceph CLI,
appropriately translated to HTTP GET/PUT requests.  It is not a
truly RESTful interface.

Not supported at this moment: "tell", "pg <pgid>", and "daemon"
commands.

Configuration options are specified in ceph.conf, specified with
-c/--conf or obtained from $CEPH_CONF, /etc/ceph/ceph.conf,
~/.ceph/ceph.conf, or ./ceph.conf.

-n/--name specifies the client name, used for the cluster
authentication key and for the ceph.conf section name (default
is client.restapi).

        restapi keyring = <keyring file>
        restapi public addr = listenIP:port (default 0.0.0.0:5000)
        restapi base url = <base path> (default /api/v0.1)
        restapi log level = (error, warning, info, debug)
        restapi log file = (default /var/log/ceph/<clientname>.log)

Primitive human-level command discovery is supported; GET from
BASEURL (say, http://localhost:5000/api/v0.1) will show an HTML
table of all commands and arguments, method supported, and help strings.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-07-10 20:58:51 -07:00
Danny Al-Gaaf
ff5f25eb24 debian/ceph-test.install: add missing files
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-07-10 17:55:52 +02:00
Gary Lowell
d4ca36b317 Merge branch 'next' 2013-07-08 23:17:50 -07:00
Gary Lowell
b6b48dbefa v0.66 2013-07-08 15:45:00 -07:00
Laurent Barbe
0efcccdcc2 Move rbdmap file to /etc/ceph
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2013-07-02 16:53:11 +02:00
Laurent Barbe
ffe7045893 install rules for init-rbdmap
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2013-07-02 16:50:40 +02:00
Gary Lowell
70be76b2e2 Merge branch 'next' 2013-06-25 13:45:22 -07:00
Gary Lowell
c2d517ef96 v0.65 2013-06-25 09:19:32 -07:00
Sage Weil
046e3b71a1 debian, rpm: remove python-lockfile dependency
As for 2a4953b697 ceph-disk no longer uses
this.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-06-24 13:04:58 -07:00
Sage Weil
1aca370ed0 debian: ceph-common requires matching version of python-ceph
If they skew the ceph_argparse.py module may be missing.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-06-22 10:28:16 -07:00
Gary Lowell
3474fa8361 rules: Don't disable tcmalloc on ARM (and other non-intel)
Fixes #5342

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-06-14 15:11:05 -07:00
Gary Lowell
35ac835fc8 Merge branch 'next' 2013-06-12 15:00:05 -07:00
Gary Lowell
42e06c12db v0.64 2013-06-12 09:54:06 -07:00
Dan Mick
3ac6ffe802 Merge branch 'wip-ceph-cli' into master
Conflicts:
	src/include/rados/librados.h
	src/librados/librados.cc
	src/osdc/Objecter.cc
	src/pybind/rados.py

Required modifications to:
	src/osd/OSD.cc

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-06-06 20:08:15 -07:00
Josh Durgin
5a53da3c16 ceph-test: add ceph_test_rados_api_lock to packaging and qa
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-06-05 12:58:44 -07:00
Dan Mick
ee0913c2e6 Merge remote-tracking branch 'origin/master' into wip-ceph-cli
Conflicts:
	src/mon/OSDMonitor.cc
	src/osd/OSD.cc
	src/osd/ReplicatedPG.cc
2013-06-04 13:12:08 -07:00
Dan Mick
51a887a24c Add ceph_test_rados_api_cmd to the ceph-test package
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-06-03 21:07:17 -07:00
Sage Weil
44d1513880 Merge remote-tracking branch 'gh/next' 2013-06-02 14:48:04 -07:00
Sage Weil
cf9aa7a003 debian: guard upstart {start,stop} with -x check
Sigh.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 17:23:36 -07:00
Sage Weil
1d75b49c72 debian: add radosgw.postinst
Start radosgw-all job.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 16:22:54 -07:00
Sage Weil
d126a205ca debian: invoke-rc.d does not work with upstart jobs
Broken by 19c5ac37ef.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 16:22:40 -07:00
Sage Weil
59916b8efa debian: stop radosgw daemons on package removal
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 08:53:22 -07:00
Sage Weil
9e658f0321 debian: stop sysvinit ceph-mds daemons
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 08:53:05 -07:00
Sage Weil
70a383204b debian: only stop daemons on removea; not upgrade
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 08:51:16 -07:00
James Page
e634d9d6b6 Use new fuse package instead of fuse-utils
The fuse-utils package was deprecated a while ago.

Switch the primary dependency for fuse tools to use
the preferred 'fuse' package.

Signed-off-by: James Page <james.page@ubuntu.com>
2013-05-29 10:57:17 +01:00
Sage Weil
6afc22a158 Merge remote-tracking branch 'gh/last' 2013-05-28 22:10:21 -07:00
Gary Lowell
054e96cf79 v0.63 2013-05-28 13:58:22 -07:00
Dan Mick
70a96973e9 packaging fixes around the new ceph cli:
Remove ceph-legacy-cli
Include ceph in proper places to get it built/installed/packaged
Make ceph-common (deb) or ceph (rpm) pkg depend on python-ceph pkg

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-05-21 20:33:23 -07:00
Dan Mick
850a4cc4f1 Rename "ceph" tool to "ceph-legacy-cli"
Conflicts:
	src/Makefile.am

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-05-21 15:54:12 -07:00
Sage Weil
bbcbab448b Merge branch 'next'
Conflicts:
	debian/ceph.prerm
2013-05-21 08:26:57 -07:00
James Page
19c5ac37ef Use invoke-rc.d in maintainer scripts
Upstart configurations and sysv init scripts should be started and stopped
using invoke-rc.d in maintainer scripts.

This ensures the correct behaviour across both Debian (sysv) and Ubuntu (upstart)
and in restricted environments such as schroot where start/stop of services from
maintainer scripts is normally disabled.

Signed-off-by: James Page <james.page@ubuntu.com>
2013-05-21 09:22:39 +01:00
Sage Weil
2f193fb931 debian: stop sysvinit on ceph.prerm
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-20 14:39:16 -07:00
Sage Weil
d8d7113c35 udev: install disk/by-partuuid rules
Wheezy's udev (175-7.2) has broken rules for the /dev/disk/by-partuuid/
symlinks that ceph-disk relies on.  Install parallel rules that work.  On
new udev, this is harmless; old older udev, this will make life better.

Fixes: #4865
Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-16 18:40:29 -07:00
Sage Weil
604c83ff18 debian: make radosgw require matching version of librados2
...indirectly via ceph-common.  We get bad behavior when they diverge, I
think because of libcommon.la being linked both statically and dynamically.

Fixes: #4997
Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-05-16 13:17:45 -07:00
Gary Lowell
9382379cc6 v0.62 2013-05-14 09:13:07 -07:00
Gary Lowell
3ebddf17cb debian/control: squeeze requres cryptsetup package
Squeeze requires the cryptsetup package which has been renamed
cryptsetup-bin in later versions.  Allow either package to
satisfy the dependency.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
(cherry picked from commit 83bbae415d)
2013-05-08 16:36:42 -07:00
Gary Lowell
237f3f1e8d v0.61 2013-05-06 13:18:56 -07:00
Danny Al-Gaaf
e662b6140b ceph-test.install: add ceph-monstore-tool and ceph-osdomap-tool
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-06 11:30:37 -07:00
Sage Weil
030bf8aaa1 debian: only start/stop upstart jobs if upstart is present
This avoids errors on non-upstart distros (like wheezy).

Signed-off-by: Sage Weil <sage@inktank.com>
2013-04-29 17:01:55 -07:00
Gary Lowell
5c1782a57c debian/rules: Fix tcmalloc breakage
Since all currently supported platforms have tcmalloc
available and it is now the default, remove broken check code
that turns it off if the package is not listed in build-depends.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-04-26 16:04:52 -07:00
Dan Mick
a2a23ccd95 debian/rules: use multiline search to look for Build-Depends
When Build-Depends was split into multiple lines (in commit
8f5c665744), the grep for
libgoogle-perftools-dev broke.  Replace grep with perl for multiline
matching.

Fixes: #4818
Signed-off-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit 89692e099f)
2013-04-26 10:19:04 -07:00
Gary Lowell
7ad63d23d7 ceph-disk: OSD hotplug fixes for Centos
Two fixes for Centos 6.3 and other systems with udev versions
prior to 172.  The disk peristant name using the GPT UUID does
not exist, so use the by_path persistent name instead for the
journal symlink.

The gpt label fields are not available for use in udev rules. Add
ceph-disk-udev wrapper script that extracts the partition
type guid from the label and calls ceph-disk-activate if it is
a ceph guid type. (Bug #4632)

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-04-22 22:30:39 -07:00
Gary Lowell
7e4f80b12e debian/control: Fix typo in libboost version number
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-04-18 10:41:38 -07:00
Gary Lowell
f4bc760776 build: Add new package dependencies
Add libboost-system-dev (bug #4725).

Add hdparm to rpm installation requirements.  The hdparm
command is used to determin if write-caching is enabled on
the journal device.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-04-18 10:41:20 -07:00
Danny Al-Gaaf
e5cecd7656 debian/ceph-test.install: add installed but not packaged files
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-04 18:38:11 +02:00
Danny Al-Gaaf
6b80296422 debian/ceph.install: no need to move files to usr/sbin/
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-04 16:00:18 +02:00
Gary Lowell
6ffadce67e Merge branch 'next' 2013-04-01 17:57:45 -07:00
Gary Lowell
f26f7a3902 v0.60 2013-04-01 12:22:53 -07:00
Andras Elso
2da57d7675 debian: Add git to Build-Depends (need by check_version script)
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-03-29 13:34:54 +01:00
Andras Elso
8f5c665744 debian: Run wrap-and-sort from devscripts
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-03-29 13:34:48 +01:00
Sage Weil
84738791fe Merge branch 'next' 2013-03-23 11:03:58 -07:00
Sage Weil
838f1cde94 preserve /var/lib/ceph on deb/rpm purge
We should clobber configuration and log data, but *not* user data.  Leave
/var/lib/ceph alone.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-03-22 15:24:51 -07:00
Sage Weil
c9157a1946 Merge pull request #117 from ceph/wip-ceph-disk
ceph-disk-* refactor
2013-03-22 10:06:13 -07:00
Gary Lowell
d67eee1d11 Merge branch 'next' 2013-03-21 00:40:16 -07:00
Gary Lowell
cbae6a435c v0.59 2013-03-19 22:27:13 -07:00
David Zafman
6a3aa2a2cc Missed adding rados_types.hpp to package
Caused by 3bd48cbbad
feature 4207 implementation

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
(cherry picked from commit e1e2d5d217)
2013-03-19 13:02:00 -07:00
Sage Weil
c2602d7490 ceph-disk: install and package
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-19 12:52:23 -07:00
Sage Weil
632f7200bb Merge branch 'next'
Conflicts:
	src/mon/AuthMonitor.cc
2013-03-14 21:11:35 -07:00
Gary Lowell
6f15dba931 debian/control: Fix for moved file
The ceph-mds.conf file moced from the ceph package to the
ceph-mds package.  Add replaces/breaks statements to the
control file to handle this on upgrade.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-03-14 17:16:24 -07:00
Sage Weil
efd153e9e2 debian: add start ceph-mds-all on ceph-mds install
This ensures that when we then start individual mds instances, we can
stop ceph-mds-all and they will get stopped.  We do the same already for
ceph-all.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 41897fcba1)
2013-03-14 12:33:57 -07:00
Sage Weil
41897fcba1 debian: add start ceph-mds-all on ceph-mds install
This ensures that when we then start individual mds instances, we can
stop ceph-mds-all and they will get stopped.  We do the same already for
ceph-all.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-14 12:33:08 -07:00
Gary Lowell
a5156fb74c Merge pull request #97 from Elbandi/master
Fix FTBFS

Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-03-12 11:15:00 -07:00
Josh Durgin
82677c38b7 Merge branch 'next' 2013-03-11 16:59:05 -07:00
Sage Weil
9eb0d91b86 debian: stop ceph-mds before uninstalling ceph-mds
Fixes: #4384
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-11 17:09:37 -07:00
Andras Elso
0dd956cb02 debian: Fix FTBFS because depend on old libboost-dev
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-03-10 01:18:16 +01:00
David Zafman
e1e2d5d217 Missed adding rados_types.hpp to package
Caused by 3bd48cbbad
feature 4207 implementation

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-03-06 14:40:29 -08:00
Alan Grosskurth
a319f5cb74 debian: require libsnappy-dev for ceph
Debian builds are currently broken without this requirement.
2013-03-06 02:21:12 -08:00
Gary Lowell
af6b6eddae Merge branch 'master' of https://github.com/ceph/ceph 2013-03-05 09:06:24 -08:00
Gary Lowell
66cadbe515 Merge branch 'next' 2013-03-05 09:05:21 -08:00
Josh Durgin
867586c674 debian: require >= python2.6 for ceph as well
ceph-disk-prepare and ceph-disk-activate use the with statement,
str.format, and possibly other new features from python 2.6.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-03-04 16:49:14 -08:00
Gary Lowell
ba3f91e750 v0.58 2013-03-04 15:18:24 -08:00
Filippos Giannakos
66df847e00 Add X-Python-Version >=2.6 to debian control file.
python-ceph complains when installed to debian squeeze about the 'with'
statement. Apparently installation tries to install the python-ceph package for
python 2.5, which does not support the 'with' statement natively.

Signed-off-by: Filippos Giannakos <philipgian@grnet.gr>
2013-03-04 15:10:00 -08:00
Gary Lowell
b65ca564b6 ceph-test.install: Add libcephfs-test.jar to package.
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-27 18:25:09 -08:00
Sage Weil
cfcaceac44 debian: require cryptsetup-bin
This is needed for ceph-disk-prepare's dmcrypt support.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-27 15:43:57 -08:00
Sage Weil
d9d075e976 debian: let dpkg calculate the shlibs dep for leveldb (if any)
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-27 09:45:02 -08:00
Danny Al-Gaaf
f42a63ba1b debian/control: fix Depends
Remove request for libleveldb1 version > 1.2. Every libleveldb1 package
should work, otherwise the SO name/version of the library should change.

Fixes: #3945

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 15:39:18 +01:00
Danny Al-Gaaf
43161532d6 debian/control: add libleveldb-dev to Build-Depends:
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 14:47:49 +01:00
Gary Lowell
ea546aef0c Build: Change build to always use system leveldb
Dynamically link to the leveldb installed on the system rather than
statically linking ceph copy.  Remove the --with-system-leveldb config
option, and add a requirement for leveldb libraries for rpm and debian
packages.  Bug 3945.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-26 20:07:49 -08:00
Gary Lowell
a34e7c6f6b ceph-test.install: remove cepkfs-test.jar
This was merged prematurely to mast.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-26 18:28:34 -08:00
Gary Lowell
0666b630b7 ceph-test.install: Add libcephfs-test.jar.
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-26 17:29:46 -08:00
Danny Al-Gaaf
cf167a1f30 debian: add new files
Add new (installed) files to debian install files.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-25 15:36:37 +01:00
Sage Weil
9217c4ac68 debian: make gdisk, parted requirements, not recommendations.
ceph-prepare-disk (and thus ceph-deploy) need this.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-24 13:31:06 -08:00
Gary Lowell
bcb210c677 Merge branch 'next' 2013-02-19 14:53:54 -08:00
Gary Lowell
9a7a9d06c0 v0.57 2013-02-19 10:07:42 -08:00