Sage Weil
7d112c6483
mon/MDSMonitor: drop incorrect m->put()
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-13 21:36:29 -04:00
Sage Weil
c625671c58
Merge pull request #5840 from liewegas/wip-12991
...
qa/workunits/cephtool/test.sh: make mds epoch check more tolerant
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-13 09:08:57 -04:00
Sage Weil
770a573b0b
Merge remote-tracking branch 'gh/infernalis'
2015-09-13 07:45:30 -04:00
Sage Weil
e73ac661a4
Merge pull request #5686 from liewegas/wip-hammer-feature
...
require osds are hammer v0.94.4 or later before upgrading past hammer
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-13 07:41:56 -04:00
Sage Weil
cac601d631
Merge pull request #5905 from ceph/wip-rpm-notcmalloc
...
ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS
2015-09-12 20:44:05 -04:00
Sage Weil
f8c66b4116
Merge pull request #5904 from ceph/wip-submodules
...
fix a few submodule issues
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-12 20:43:48 -04:00
Sage Weil
af39f98b53
.gitignore: ignore src/ceph.tmpe
...
It makes the gitbuilders unhappy. Not sure where it comes from...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 17:43:52 -04:00
Sage Weil
98302adf99
gmock: ignore *.pyc
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 14:21:32 -04:00
Sage Weil
c57e8688fe
rocksdb: ignore m4
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 14:17:01 -04:00
Sage Weil
51abff1168
ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 14:12:20 -04:00
Sage Weil
4a5a5b3705
qa/workunits/cephtool/test.sh: make mds epoch check more tolerant
...
This can race with an actual mdsmap epoch update for some other
reason. We just need to make sure the epoch *increased*, not that
it is exactly old + 1.
Fixes : #12991
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 13:51:13 -04:00
Sage Weil
a511c24547
Merge remote-tracking branch 'gh/wip-10617-again'
2015-09-12 13:45:09 -04:00
Kefu Chai
9429b7735f
Merge pull request #5334 from majianpeng/read-len-zero-for-ec
...
make read ec-object(offset=0, len=0) can work like read no-ec object.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-13 00:05:27 +08:00
Sage Weil
d33fea5d38
sd/PG: tolerate missing pgmeta object
...
Bug 10617 left stray PG dirs around in firefly. Hammer correctly
ignores these, assuming they are leftover cruft. We broke this
when we dropped compat support in cd4e676e6d
See also #13060 .
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 09:20:02 -04:00
Sage Weil
f15d9585ed
osd: allow peek_map_epoch to return an error
...
Allow PG::peek_map_epoch to return an error indicating the PG
should be skipped.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 09:20:02 -04:00
Sage Weil
2e44373eac
Merge pull request #5776 from wonzhq/tmap-update
...
osd: force promote for ops which ec base pool can't handle
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-12 09:19:20 -04:00
Sage Weil
ff9600a6ce
osd/ReplicatedPG: remove stray debug line
...
This snuck in
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 08:33:44 -04:00
Sage Weil
78de6fd61d
Merge pull request #5896 from liewegas/wip-fix-spec
...
ceph.spec: include /etc/sysconfig/ceph
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-11 13:02:29 -04:00
Sage Weil
4dea76e028
ceph.spec: include /etc/sysconfig/ceph
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 12:19:59 -04:00
Sage Weil
f5c8735d61
Merge pull request #5895 from jcsp/wip-doc-default-pools
...
doc: remove references to default data/metadata pools
2015-09-11 11:56:29 -04:00
John Spray
865708120f
doc: remove references to default data/metadata pools
...
These haven't existed since 0.84 -- the cephfs documentation
was updated at the time, but there were also references in the
rados documentation.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-09-11 16:46:52 +01:00
Sage Weil
89e2c28c9d
Merge pull request #5803 from ceph/wip-debian-systemd
...
debian systemd support; /etc/{sysconfig,default}/ceph; easy jemalloc enablement
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2015-09-11 11:42:36 -04:00
Sage Weil
c3d23caddf
ceph-common: explicitly trigger /run/ceph creation
...
This doesn't happen magically on debian.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:47 -04:00
Sage Weil
ea91c4ef85
systemd: tmpfiles.d in /run, not /var/run
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:47 -04:00
Sage Weil
c92d13b041
debian: fix location of tmpfiles.d
...
/usr/lib/tmpfiles.d, not /lib/tmpfiles.d
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:26 -04:00
Sage Weil
7384a14f24
debian/rules: install systemd files and /etc/default/ceph
...
Fix the systemd units to use /etc/default instead of /etc/sysconfig. There
is probably a better way...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:26 -04:00
Sage Weil
cd4bd80a34
Makefile.am: include etc in tarball
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:26 -04:00
Sage Weil
c8bfc354e1
ceph.spec: install /etc/sysconfig/ceph
...
Make it easy to enable jemalloc, too.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:26 -04:00
Sage Weil
6779bc2d24
Merge pull request #5869 from ceph/wip-rpm-dirs
...
ceph.spec: make /var/{lib,log,run} owned by ceph
Reviewed-by: Boris Ranto <branto@redhat.com>
2015-09-11 11:36:25 -04:00
Sage Weil
cbb8cf8328
Merge pull request #5540 from ceph/wip-selinux-radosgw
...
selinux: Update policy for radosgw
Reviewed-by: Milan Broz <mbroz@redhat.com>
2015-09-11 11:31:36 -04:00
Sage Weil
3aa38bc07f
make /var/run/ceph 770 ceph:ceph
...
This allows members of the ceph group to make librados clients (like the
ceph cli and qemu) create sockets in the default /var/run/ceph/* location.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:26:59 -04:00
Sage Weil
e7837d1d36
ceph.spec: make /var/{lib,log,run} owned by ceph
...
Move creation of /var/lib/ceph and /var/run/ceph to ceph-common, too.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:24:18 -04:00
Sage Weil
7e7179b4bf
Merge pull request #5871 from liewegas/wip-10328
...
common: add debug option to deliberately leak some memory
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-11 09:35:50 -04:00
Sage Weil
08781399f2
Merge remote-tracking branch 'gh/wip-tcmalloc'
2015-09-11 09:30:17 -04:00
Sage Weil
f167e8d3dc
.gitignore: radosgw-object-expirer
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 09:30:15 -04:00
Sage Weil
90cce11874
Merge pull request #5881 from cernceph/wip-logrotate
...
logrotate: ignore exit status 1 from killall
Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-11 09:24:17 -04:00
Boris Ranto
e5a8022ddb
ceph.spec.in: ceph-radosgw should require ceph-selinux
...
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-09-11 11:08:13 +02:00
Boris Ranto
338bd3d177
selinux: Update policy for radosgw
...
The current SELinux policy does not cover radosgw daemon. This patch
introduces the SELinux support for radosgw daemon (civetweb only).
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-09-11 11:08:08 +02:00
Dan van der Ster
217e424810
logrotate: ignore postrotate error for radosgw
...
Fix the annoying logrotate error for radosgw.
Fixes : #13033
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
2015-09-11 09:42:50 +02:00
Dan van der Ster
aa4a5b0d15
logrotate: ignore exit status 1 from killall
...
If any of ceph-osd, ceph-mon, ceph-mds were not running then
killall -q will exit status 1, leading to anacron sending a mail
error: error running shared postrotate script for '/var/log/ceph/*.log '
Fix by overriding the exit status with || true.
Fixes : #13033
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
2015-09-11 09:30:04 +02:00
Sage Weil
48c4228671
Merge pull request #5800 from ceph/wip-user
...
ceph-disk: do async startup on upstart; fix dmcrypt create/activate bug
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-10 18:48:53 -04:00
Sage Weil
d4eeb9be0f
rocksdb: recognized --without-tcmalloc
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-10 17:03:03 -04:00
David Zafman
86dbfc88f8
Merge pull request #5031 from trociny/wip-10098
...
ceph-objectstore-tool: add mark-complete operation
Reviewed-by: David Zafman <dzafman@redhat.com>
2015-09-10 13:42:09 -07:00
Yehuda Sadeh
fa94ca4ed0
Merge pull request #5866 from jmunhoz/wip-requestid-on-error
...
rgw: include RequestId as part of the Error response
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-09-10 13:14:40 -07:00
Joao Eduardo Luis
046bdf8e9e
Merge pull request #5859 from jecluis/wip-test-mon-ping
...
test: mon/mon-ping.sh: make sure 'ceph mon ping' works as expected
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-10 20:04:41 +01:00
Josh Durgin
50c9beeba2
Merge pull request #5873 from dillaman/wip-rbd-missing-return
...
rbd: missing return statement within do_metadata_remove
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-09-10 13:45:37 -04:00
Jason Dillaman
8e07c8c8af
rbd: missing return statement within do_metadata_remove
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-09-10 12:21:57 -04:00
Sage Weil
e7c509ab75
Merge pull request #5780 from dzafman/wip-12387
...
osd: When generating past intervals due to an import end at pg epoch
Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-10 10:56:45 -04:00
Sage Weil
82ba048d2c
common: add debug option to deliberately leak some memory
...
This will be used to verify leak detection tests are working.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-10 10:35:11 -04:00
Sage Weil
c4401ad60e
test/Makefile-client: ship LibradosTestStub.h in tarball
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-10 07:51:52 -04:00