Commit Graph

514 Commits

Author SHA1 Message Date
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