]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoerasure-code: workaround i386 optimization bug with SHEC 6006/head
Loic Dachary [Mon, 21 Sep 2015 13:36:54 +0000 (15:36 +0200)]
erasure-code: workaround i386 optimization bug with SHEC

http://tracker.ceph.com/issues/12936 Fixes: #12936

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5750 from wonzhq/rbd-write-full
Josh Durgin [Mon, 21 Sep 2015 23:13:37 +0000 (19:13 -0400)]
Merge pull request #5750 from wonzhq/rbd-write-full

librbd: do write_full for whole object write

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5416 from zhouyuan/ceph_fuse_12204
Gregory Farnum [Mon, 21 Sep 2015 23:02:33 +0000 (16:02 -0700)]
Merge pull request #5416 from zhouyuan/ceph_fuse_12204

ceph-fuse: warn and shut down when there is no MDS present

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #5826 from ukernel/wip-osx-port
Gregory Farnum [Mon, 21 Sep 2015 22:57:13 +0000 (15:57 -0700)]
Merge pull request #5826 from ukernel/wip-osx-port

fix compilation on OSX/FreeBSD

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge branch 'wip-12971' of git://github.com/jcsp/ceph
Greg Farnum [Mon, 21 Sep 2015 22:55:04 +0000 (15:55 -0700)]
Merge branch 'wip-12971' of git://github.com/jcsp/ceph

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Conflicts:
src/osdc/Objecter.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #5644 from majianpeng/mds-support-iohint
Gregory Farnum [Mon, 21 Sep 2015 22:52:10 +0000 (15:52 -0700)]
Merge pull request #5644 from majianpeng/mds-support-iohint

Mds journal support iohint

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5966 from ukernel/wip-12506
Gregory Farnum [Mon, 21 Sep 2015 22:50:28 +0000 (15:50 -0700)]
Merge pull request #5966 from ukernel/wip-12506

Wip 12506

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #5962 from majianpeng/client-fix
Gregory Farnum [Mon, 21 Sep 2015 22:49:34 +0000 (15:49 -0700)]
Merge pull request #5962 from majianpeng/client-fix

Client fix mini bugs.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #6014 from athanatos/wip-13108
Sage Weil [Mon, 21 Sep 2015 18:51:50 +0000 (14:51 -0400)]
Merge pull request #6014 from athanatos/wip-13108

Revert "osd: purge the object from the cache when proxying and not pr…

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6015 from athanatos/wip-13143
Sage Weil [Mon, 21 Sep 2015 18:51:07 +0000 (14:51 -0400)]
Merge pull request #6015 from athanatos/wip-13143

osd/: find_object_context: return obc for head for snapdir if non null

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6017 from athanatos/wip-13150
Sage Weil [Mon, 21 Sep 2015 18:46:33 +0000 (14:46 -0400)]
Merge pull request #6017 from athanatos/wip-13150

ReplicatedPG::get_snapset_context: set exists to false for new ssc wi…

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6013 from athanatos/wip-12828
Sage Weil [Mon, 21 Sep 2015 18:43:55 +0000 (14:43 -0400)]
Merge pull request #6013 from athanatos/wip-12828

Wip 12828

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5918 from oritwas/wip-5378 5971/head
Yehuda Sadeh [Mon, 21 Sep 2015 15:35:30 +0000 (08:35 -0700)]
Merge pull request #5918 from oritwas/wip-5378

rgw: make radosgw-admin user rm idempotent

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5996 from rzarzynski/wip-12780
Yehuda Sadeh [Mon, 21 Sep 2015 15:22:29 +0000 (08:22 -0700)]
Merge pull request #5996 from rzarzynski/wip-12780

rgw: don't read actual data on user manifest HEAD

9 years agoMerge pull request #5974 from Sandy4999/wip-rgw-errmsg
Yehuda Sadeh [Mon, 21 Sep 2015 15:20:55 +0000 (08:20 -0700)]
Merge pull request #5974 from Sandy4999/wip-rgw-errmsg

rgw: add a new error message for user conflict when using Admin Ops API

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6003 from ukernel/wip-13166
John Spray [Mon, 21 Sep 2015 09:25:39 +0000 (10:25 +0100)]
Merge pull request #6003 from ukernel/wip-13166

Wip 13166

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agomds: adjust MDSRank::incarnation according to mdsmap 6003/head
Yan, Zheng [Mon, 21 Sep 2015 07:20:15 +0000 (15:20 +0800)]
mds: adjust MDSRank::incarnation according to mdsmap

When a standby-replay MDS replace failed MDS, we need update its
incarnation.

Fixes: #13166
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #6001 from dachary/wip-13182-crushtool
Sage Weil [Mon, 21 Sep 2015 00:57:13 +0000 (20:57 -0400)]
Merge pull request #6001 from dachary/wip-13182-crushtool

tests: update to match crushmap validation message

9 years agotests: update to match crushmap validation message 6001/head
Loic Dachary [Sun, 20 Sep 2015 21:42:45 +0000 (23:42 +0200)]
tests: update to match crushmap validation message

http://tracker.ceph.com/issues/13182 Fixes: #13182

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Sun, 20 Sep 2015 17:54:19 +0000 (13:54 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoMerge pull request #5979 from ceph/wip-crushtest
Sage Weil [Sun, 20 Sep 2015 17:50:26 +0000 (13:50 -0400)]
Merge pull request #5979 from ceph/wip-crushtest

mon: fix crush testing for new pools

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5950 from tchaikov/wip-13112-infernalis
Sage Weil [Sun, 20 Sep 2015 17:49:36 +0000 (13:49 -0400)]
Merge pull request #5950 from tchaikov/wip-13112-infernalis

mon/PGMap: calc min_last_epoch_clean when decode

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5998 from dachary/wip-13136-python3-coverage
Loic Dachary [Sun, 20 Sep 2015 15:12:32 +0000 (17:12 +0200)]
Merge pull request #5998 from dachary/wip-13136-python3-coverage

install-deps: enable python3

9 years agoinstall-deps: enable python3 5998/head
Loic Dachary [Fri, 18 Sep 2015 10:59:09 +0000 (12:59 +0200)]
install-deps: enable python3

The upstream regression has been fixed, we can re-enable python3
support.

http://tracker.ceph.com/issues/13136 Fixes: #13136

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5994 from SUSE/wip-13175
Sage Weil [Sat, 19 Sep 2015 21:21:10 +0000 (17:21 -0400)]
Merge pull request #5994 from SUSE/wip-13175

doc: do not promise backports to Dumpling

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agodoc: do not promise backports to Dumpling 5994/head
Nathan Cutler [Sat, 19 Sep 2015 20:25:31 +0000 (22:25 +0200)]
doc: do not promise backports to Dumpling

Dumpling was retired in May 2015.

http://tracker.ceph.com/issues/13175 Fixes: #13175

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
9 years agoMerge pull request #5965 from jcsp/wip-get-or-create-output
John Spray [Sat, 19 Sep 2015 11:03:57 +0000 (12:03 +0100)]
Merge pull request #5965 from jcsp/wip-get-or-create-output

mon: fix auth get-or-create output

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #5984 from ceph/wip-packages
Ken Dreyer [Fri, 18 Sep 2015 18:41:42 +0000 (12:41 -0600)]
Merge pull request #5984 from ceph/wip-packages

Fixes locations from ceph.com to download.ceph.com

(For the record, this is to fix http://tracker.ceph.com/issues/13162)

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agodoc: remove mention of ceph-extra as a requirement 5984/head
Alfredo Deza [Fri, 18 Sep 2015 18:20:12 +0000 (14:20 -0400)]
doc: remove mention of ceph-extra as a requirement

Signed-off-by: Alfredo Deza <adeza@redhat.com>
9 years agodoc: remove ceph-extras
Alfredo Deza [Fri, 18 Sep 2015 18:13:21 +0000 (14:13 -0400)]
doc: remove ceph-extras

Signed-off-by: Alfredo Deza <adeza@redhat.com>
9 years agodoc: correct links to download.ceph.com
Alfredo Deza [Fri, 18 Sep 2015 18:13:02 +0000 (14:13 -0400)]
doc: correct links to download.ceph.com

Signed-off-by: Alfredo Deza <adeza@redhat.com>
9 years agomon: fix auth get-or-create output 5965/head
John Spray [Thu, 17 Sep 2015 14:51:20 +0000 (15:51 +0100)]
mon: fix auth get-or-create output

Previously the caps were omitted from the
output: they should be present for this
to fulfil the 'get' part of get-or-create.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoReplicatedPG::get_snapset_context: set exists to false for new ssc with can_create 6017/head
Samuel Just [Thu, 17 Sep 2015 23:49:53 +0000 (16:49 -0700)]
ReplicatedPG::get_snapset_context: set exists to false for new ssc with can_create

Otherwise, if we do a proxy_write and don't promote it, the ssc will
stick around with exists = true and cause future reads on snaps for the
object to fail to fall through to the base tier.

Fixes: #13150
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agorgw: don't read actual data on user manifest HEAD 5996/head
Yehuda Sadeh [Thu, 17 Sep 2015 16:10:39 +0000 (09:10 -0700)]
rgw: don't read actual data on user manifest HEAD

Fixes: #12780
We unconditionally read all the data, which is not needed
when doing HEAD operation on user manifest objects.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoceph-osd-prestart.sh: no ceph-disk chown
Sage Weil [Fri, 18 Sep 2015 15:40:26 +0000 (11:40 -0400)]
ceph-osd-prestart.sh: no ceph-disk chown

chown -R ceph:ceph $1 is easy enough.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5980 from liewegas/wip-13059
Sage Weil [Fri, 18 Sep 2015 15:06:24 +0000 (11:06 -0400)]
Merge pull request #5980 from liewegas/wip-13059

ceph.spec: fix up /var/run/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoceph.spec.in: Fix up (/var)/run/ceph creation 5980/head
Boris Ranto [Fri, 18 Sep 2015 15:00:30 +0000 (17:00 +0200)]
ceph.spec.in: Fix up (/var)/run/ceph creation

Fixes: #13059
Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #5977 from tchaikov/wip-size_t-monstore-txn
Kefu Chai [Fri, 18 Sep 2015 14:32:41 +0000 (22:32 +0800)]
Merge pull request #5977 from tchaikov/wip-size_t-monstore-txn

mon: return size_t from MonitorDBStore::Transaction::size()

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agomon/OSDMonitor: fix crush injection error message 5979/head
Sage Weil [Fri, 18 Sep 2015 13:42:47 +0000 (09:42 -0400)]
mon/OSDMonitor: fix crush injection error message

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/OSDMonitor: only test crush ruleset for the newly created pool
Sage Weil [Fri, 18 Sep 2015 13:41:25 +0000 (09:41 -0400)]
mon/OSDMonitor: only test crush ruleset for the newly created pool

Otherwise, we test *all* crush rules.. which might be a lot, and
which is a big waste of time and effort.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocrush/CrushTester: allow testing by ruleset
Sage Weil [Fri, 18 Sep 2015 13:40:13 +0000 (09:40 -0400)]
crush/CrushTester: allow testing by ruleset

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: return size_t from MonitorDBStore::Transaction::size() 5977/head
Kefu Chai [Fri, 18 Sep 2015 09:05:09 +0000 (17:05 +0800)]
mon: return size_t from MonitorDBStore::Transaction::size()

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agorgw: add a new error message for user conflict when using Admin Ops API 5974/head
Sangdi [Fri, 18 Sep 2015 03:02:07 +0000 (11:02 +0800)]
rgw: add a new error message for user conflict when using Admin Ops API

Add a new error message to indicate user conflict, which was using the error code for bucket conflict.

Signed-off-by: Sangdi Xu <xu.sangdi@h3c.com>
9 years agoMerge pull request #5948 from flyd1005/master
Sage Weil [Fri, 18 Sep 2015 02:14:56 +0000 (22:14 -0400)]
Merge pull request #5948 from flyd1005/master

doc: delete wrong description of installing RPMs

9 years agoosd/: find_object_context: return obc for head for snapdir if non null 6015/head
Samuel Just [Thu, 17 Sep 2015 17:54:18 +0000 (10:54 -0700)]
osd/: find_object_context: return obc for head for snapdir if non null

The head obc may have an in progress operation holding a lock, we
need to block on the lock for ordering reasons.

Fixes: #13143
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #5926 from dillaman/wip-13082
Sage Weil [Thu, 17 Sep 2015 19:09:17 +0000 (15:09 -0400)]
Merge pull request #5926 from dillaman/wip-13082

include/inline_memory: out-of-bounds read on unaligned memory

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agomds: Make sure wanted_state of first MDSBeacon is MDSMap::STATE_BOOT 5966/head
Yan, Zheng [Thu, 17 Sep 2015 15:56:14 +0000 (23:56 +0800)]
mds: Make sure wanted_state of first MDSBeacon is MDSMap::STATE_BOOT

Fixes: #12506
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agonew release key
Sage Weil [Thu, 17 Sep 2015 14:47:26 +0000 (10:47 -0400)]
new release key

The previous release key,

pub   4096R/460F3994 2015-09-15
uid                  Ceph.com (release key) <security@ceph.com>

may have been compromised.

The new release key is

pub   4096R/460F3994 2015-09-15
uid                  Ceph.com (release key) <security@ceph.com>

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5947 from weiqian/master
Kefu Chai [Thu, 17 Sep 2015 15:44:57 +0000 (23:44 +0800)]
Merge pull request #5947 from weiqian/master

doc: replaces 'osd host' with 'host' in ceph.conf docs.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5964 from jcsp/wip-13138
Yan, Zheng [Thu, 17 Sep 2015 12:55:34 +0000 (20:55 +0800)]
Merge pull request #5964 from jcsp/wip-13138

libcephfs: fix calling init() then mount()

9 years agolibcephfs: fix calling init() then mount() 5964/head
John Spray [Thu, 17 Sep 2015 12:46:30 +0000 (13:46 +0100)]
libcephfs: fix calling init() then mount()

Previously only ever called these separately, but
it should be allowed for callers to use one after
the other.

Fixes: #13138
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5963 from jcsp/wip-cmake-cephfs
Orit Wasserman [Thu, 17 Sep 2015 10:59:43 +0000 (12:59 +0200)]
Merge pull request #5963 from jcsp/wip-cmake-cephfs

CMake: fix libcephfs shared lib generation

9 years agoMerge pull request #5857 from ceph/wip-da-SCA-20150812
Kefu Chai [Thu, 17 Sep 2015 10:54:24 +0000 (18:54 +0800)]
Merge pull request #5857 from ceph/wip-da-SCA-20150812

SCA and compiler warning fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5870 from s09816/master
Kefu Chai [Thu, 17 Sep 2015 10:52:54 +0000 (18:52 +0800)]
Merge pull request #5870 from s09816/master

osd:the fuction osd::shutdown Lock failed.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5096 from tchaikov/wip-add-bl-const-iterator
Kefu Chai [Thu, 17 Sep 2015 10:51:36 +0000 (18:51 +0800)]
Merge pull request #5096 from tchaikov/wip-add-bl-const-iterator

common/buffer: add bufferlist::const_iterator

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoCMake: fix libcephfs shared lib generation 5963/head
John Spray [Thu, 17 Sep 2015 10:26:32 +0000 (11:26 +0100)]
CMake: fix libcephfs shared lib generation

Previously weren't generating versioned symlinks
etc, so python bindings didn't find it.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5920 from caibo2014/fix-tool-bug
Kefu Chai [Thu, 17 Sep 2015 09:09:18 +0000 (17:09 +0800)]
Merge pull request #5920 from caibo2014/fix-tool-bug

tools: ceph_monstore_tool: remove the output file when get map fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5960 from dachary/wip-13136-python3-coverage
Kefu Chai [Thu, 17 Sep 2015 08:59:00 +0000 (16:59 +0800)]
Merge pull request #5960 from dachary/wip-13136-python3-coverage

install-deps.sh: disable python3

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoinstall-deps.sh: disable python3 5960/head
Loic Dachary [Thu, 17 Sep 2015 07:35:11 +0000 (09:35 +0200)]
install-deps.sh: disable python3

Disable python3 support until
https://bugs.launchpad.net/ubuntu/+source/python-coverage/+bug/1496715
is fixed.

Nothing in the build process depends on python3 right now, there is no
harm disabling it.

http://tracker.ceph.com/issues/13136 Fixes: #13136

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoclient/MetaRequest: optimize func can_forward/auth_is_best. 5962/head
Jianpeng Ma [Thu, 17 Sep 2015 03:14:31 +0000 (11:14 +0800)]
client/MetaRequest: optimize func can_forward/auth_is_best.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoclient/MetaRequest: open w/ O_CREAT|O_TRUNC is write.
Jianpeng Ma [Thu, 17 Sep 2015 02:05:46 +0000 (10:05 +0800)]
client/MetaRequest: open w/ O_CREAT|O_TRUNC is write.

From the function name is_write, it judge MetaRequest whether write.
For open, if it w/ O_CREAT|O_TRUNC, it's a write op and vice versa.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoclinet/MetaRequest: Remove the useless condition.
Jianpeng Ma [Thu, 17 Sep 2015 01:57:04 +0000 (09:57 +0800)]
clinet/MetaRequest: Remove the useless condition.

"head.op & CEPH_MDS_OP_WRITE" include "head.op == CEPH_MDS_OP_CREATE".
So remove the conditon statement "head.op == CEPH_MDS_OP_CREATE".

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agomon/PGMap: calc min_last_epoch_clean when decode 5950/head
Kefu Chai [Wed, 16 Sep 2015 07:08:17 +0000 (15:08 +0800)]
mon/PGMap: calc min_last_epoch_clean when decode

Fixes: #13112
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5841 from ceph/wip-12994-rbd-replay-packaging
Sage Weil [Wed, 16 Sep 2015 13:12:16 +0000 (09:12 -0400)]
Merge pull request #5841 from ceph/wip-12994-rbd-replay-packaging

#12994: packaging: move rbd-replay* to ceph-common

Reviewed-by: James Page <jamespage@ubuntu.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #5946 from liewegas/wip-rgw-logdir
Sage Weil [Wed, 16 Sep 2015 13:11:33 +0000 (09:11 -0400)]
Merge pull request #5946 from liewegas/wip-rgw-logdir

radosgw: log to /var/log/ceph instead of /var/log/radosgw

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agodoc: delete wrong description of installing RPMs 5948/head
Li Peng [Wed, 16 Sep 2015 06:05:05 +0000 (14:05 +0800)]
doc: delete wrong description of installing RPMs

In CentOS/RHEL 6/7, gitk and git-gui are available in default repository actually.

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agodoc:Replaces 'osd host' with 'host' 5947/head
weiqian [Wed, 16 Sep 2015 03:04:52 +0000 (11:04 +0800)]
doc:Replaces 'osd host' with 'host'

Signed-off-by: weiqian <weiq@dtdream.com>
9 years agoradosgw: log to /var/log/ceph instead of /var/log/radosgw 5946/head
Sage Weil [Tue, 15 Sep 2015 22:05:59 +0000 (18:05 -0400)]
radosgw: log to /var/log/ceph instead of /var/log/radosgw

This is simpler.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Tue, 15 Sep 2015 21:42:42 +0000 (17:42 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoMerge pull request #5725 from liewegas/wip-scrub-stats
Sage Weil [Tue, 15 Sep 2015 21:36:47 +0000 (17:36 -0400)]
Merge pull request #5725 from liewegas/wip-scrub-stats

osd/ReplicatedPG: snaptimmer: adjust stats through ctx->delta_stats

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #5925 from liewegas/wip-mon-leaks
Sage Weil [Tue, 15 Sep 2015 21:35:02 +0000 (17:35 -0400)]
Merge pull request #5925 from liewegas/wip-mon-leaks

fix various mon leaks

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #5929 from liewegas/wip-osd-leaks
Sage Weil [Tue, 15 Sep 2015 21:34:13 +0000 (17:34 -0400)]
Merge pull request #5929 from liewegas/wip-osd-leaks

misc osd leaks

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoosd: permit MDS to send writes on full pools 5942/head
John Spray [Tue, 15 Sep 2015 21:11:20 +0000 (22:11 +0100)]
osd: permit MDS to send writes on full pools

Same behaviour as the global full flag, for the
per-pool full flag.  The FS was broken by 67de12bf,
which added the pool flag handling.

Fixes: #12971
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoRevert "osd: purge the object from the cache when proxying and not promoting the op" 6014/head
Samuel Just [Tue, 15 Sep 2015 20:58:32 +0000 (13:58 -0700)]
Revert "osd: purge the object from the cache when proxying and not promoting the op"

Fixes: #13108
This reverts commit da68bb371f8b06b85a73077cd069a294193ac6c0.

9 years agoMerge pull request #5944 from tchaikov/wip-13090
John Spray [Tue, 15 Sep 2015 20:35:48 +0000 (21:35 +0100)]
Merge pull request #5944 from tchaikov/wip-13090

mds: cast numbers for mds health to string when print

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoosdc/Objecter: make unlocked 'full' helpers private
John Spray [Tue, 15 Sep 2015 20:24:18 +0000 (21:24 +0100)]
osdc/Objecter: make unlocked 'full' helpers private

These never needed to be public, let's be safe.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoosdc: fix honor_osdmap_full
John Spray [Tue, 15 Sep 2015 13:05:13 +0000 (14:05 +0100)]
osdc: fix honor_osdmap_full

This was being ignored in new code that tested
the per-pool full flags.  Refactor it so that
all the tests of full flags go through _osdmap_pool_full
and thereby experience the honor_osdmap_full policy.

Fixes: #12971
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agopackaging: move rbd-replay* to ceph-common 5841/head
Ken Dreyer [Tue, 8 Sep 2015 16:41:02 +0000 (10:41 -0600)]
packaging: move rbd-replay* to ceph-common

The rbd-replay* utilities are useful for Ceph users with RBD clients.
Currently the rbd-replay* utilities ship in the "ceph-test" package, and
we intend this ceph-test package for Ceph developers and contributors,
not normal users.

Move the rbd-replay* utilities to "ceph-common".

http://tracker.ceph.com/issues/12994 Fixes: #12994

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agosrc/test/osd/Object: allow a hole at the end of the object 5706/head 6013/head
Samuel Just [Fri, 28 Aug 2015 20:13:08 +0000 (13:13 -0700)]
src/test/osd/Object: allow a hole at the end of the object

This way, we test the case with holes at the end of the file more
often.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoosd_types.cc: add size to ObjectRecoveryInfo print
Samuel Just [Fri, 28 Aug 2015 19:49:00 +0000 (12:49 -0700)]
osd_types.cc: add size to ObjectRecoveryInfo print

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedBackend::prepare_pull: set recover_info.size for clones
Samuel Just [Fri, 28 Aug 2015 19:46:57 +0000 (12:46 -0700)]
ReplicatedBackend::prepare_pull: set recover_info.size for clones

Fixes: #12828
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agomon: debug refs on output replies 5925/head
Sage Weil [Tue, 15 Sep 2015 16:49:36 +0000 (12:49 -0400)]
mon: debug refs on output replies

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomsg/simple: discard local queued messages on shutdown
Sage Weil [Tue, 15 Sep 2015 16:46:25 +0000 (12:46 -0400)]
msg/simple: discard local queued messages on shutdown

Otherwise these generate leak detection noise.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/Monitor: fix MonSession Leak
Sage Weil [Tue, 15 Sep 2015 16:35:46 +0000 (12:35 -0400)]
mon/Monitor: fix MonSession Leak

dispatch() does not need to keep a ref; we hold one indirectly
via the MonOpRequest.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: fix MonSession operator<<
Sage Weil [Tue, 15 Sep 2015 16:32:02 +0000 (12:32 -0400)]
mon: fix MonSession operator<<

Print the object, not its pointer.  Make output unambiguously
terminated.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: do not leak messages on shutdown
Sage Weil [Tue, 15 Sep 2015 16:28:35 +0000 (12:28 -0400)]
mon: do not leak messages on shutdown

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomds: cast numbers for mds health to string when print 5944/head
Kefu Chai [Tue, 15 Sep 2015 14:08:10 +0000 (22:08 +0800)]
mds: cast numbers for mds health to string when print

MDSHealthMetric.metadata is a map<string,string>, so the num in
`m.metadata["foo"] = num` is casted to char when being printed.
they should be coverted into std::string instead.

Fixes: #13090
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis' 5818/head
Sage Weil [Tue, 15 Sep 2015 13:40:53 +0000 (09:40 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoMerge pull request #5916 from xiaoxichen/fix1
Kefu Chai [Tue, 15 Sep 2015 13:25:15 +0000 (21:25 +0800)]
Merge pull request #5916 from xiaoxichen/fix1

os/OSD.cc cast osd_max_write_size to int64_t

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5940 from flyd1005/master
Loic Dachary [Tue, 15 Sep 2015 13:22:33 +0000 (15:22 +0200)]
Merge pull request #5940 from flyd1005/master

doc: Fixes a wrong directory name and a broken hyperlink

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
9 years agoMerge pull request #5912 from badone/bug_7822
Kefu Chai [Tue, 15 Sep 2015 13:18:21 +0000 (21:18 +0800)]
Merge pull request #5912 from badone/bug_7822

examples: hello_world.cc: fix the displayed content

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5933 from dachary/wip-max-stale
Kefu Chai [Tue, 15 Sep 2015 13:14:51 +0000 (21:14 +0800)]
Merge pull request #5933 from dachary/wip-max-stale

common: osd_pg_epoch_persisted_max_stale < map_cache_size

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: fix a broken hyperlink 5940/head
Li Peng [Tue, 15 Sep 2015 12:55:08 +0000 (20:55 +0800)]
doc: fix a broken hyperlink

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agoMerge pull request #5934 from cernceph/wip-logrotate
Sage Weil [Tue, 15 Sep 2015 12:21:51 +0000 (08:21 -0400)]
Merge pull request #5934 from cernceph/wip-logrotate

logrotate: logs are now owned by ceph:ceph

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agodoc: Fixes a wrong directory name.
Li Peng [Tue, 15 Sep 2015 12:06:39 +0000 (20:06 +0800)]
doc: Fixes a wrong directory name.

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agoMerge pull request #5937 from ukernel/wip-13067
John Spray [Tue, 15 Sep 2015 10:36:56 +0000 (11:36 +0100)]
Merge pull request #5937 from ukernel/wip-13067

Wip 13067

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoExamples: hello_world.cc, content displayed after read is not null terminated. 5912/head
Brad Hubbard [Mon, 14 Sep 2015 06:00:43 +0000 (16:00 +1000)]
Examples: hello_world.cc, content displayed after read is not null terminated.

Copy contents of bufferlist to a string before sending to stdout since a
bufferlist is not null terminated.

Fixes: #7822
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agomds: reset MDSRank heartbeat timeout even when MDS is laggy 5937/head
Yan, Zheng [Tue, 15 Sep 2015 08:31:23 +0000 (16:31 +0800)]
mds: reset MDSRank heartbeat timeout even when MDS is laggy

Fixes: #13067
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agocommon: osd_pg_epoch_persisted_max_stale < map_cache_size 5933/head
Loic Dachary [Tue, 15 Sep 2015 06:47:19 +0000 (08:47 +0200)]
common: osd_pg_epoch_persisted_max_stale < map_cache_size

1ff51a299d20dd73a95ba55fdec57498b8c71c13 reduced map_cache_size to 200,
osd_pg_epoch_persisted_max_stale must be lowered because it does not
make sense for it to be the equal or greater than map_cache_size.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agologrotate: logs are now owned by ceph:ceph 5934/head
Dan van der Ster [Tue, 15 Sep 2015 07:10:59 +0000 (09:10 +0200)]
logrotate: logs are now owned by ceph:ceph

Add the su directive to avoid this error during logrotate:

error: skipping "/var/log/ceph/ceph-osd.0.log" because parent
directory has insecure permissions (It's world writable or writable
by group which is not "root") Set "su" directive in config file to
tell logrotate which user/group should be used for rotation.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>