]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agotests: ceph-disk: multipath now auto activates
Loic Dachary [Sun, 20 Sep 2015 12:54:57 +0000 (14:54 +0200)]
tests: ceph-disk: multipath now auto activates

http://tracker.ceph.com/issues/12786 Refs: #12786

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: ceph-disk: use sh() instead of helper() when possible
Loic Dachary [Sun, 20 Sep 2015 12:54:16 +0000 (14:54 +0200)]
tests: ceph-disk: use sh() instead of helper() when possible

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: doc: ceph-disk workunit reminders
Loic Dachary [Sun, 20 Sep 2015 12:52:22 +0000 (14:52 +0200)]
tests: doc: ceph-disk workunit reminders

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: reduce debug verbosity
Loic Dachary [Sun, 20 Sep 2015 19:54:59 +0000 (21:54 +0200)]
ceph-disk: reduce debug verbosity

There is no need for debug traces from which() and it is very
noisy. Just get rid of it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: ensure udev add on the data partition is last
Loic Dachary [Sun, 20 Sep 2015 12:38:34 +0000 (14:38 +0200)]
ceph-disk: ensure udev add on the data partition is last

When calling partprobe, we make sure there is at least one udev add
called for each partition created when preparing a device. But there is
no guarantee that the udev add for data partition will be last and the
following scenario can happen:

 - udev add data partition fails because the journal partition is owned
   by root
 - udev add journal partition chown the journal partition
 - no other udev add event is sent and the OSD does not activate

An additional, possibly redundant, udev add event is fired after
partprobe is run and after udevadm settles, to guarantee there is at
least one udev add data partition after the last udev add journal
partition.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: move update_partition from main_prepare to prepare_dev
Loic Dachary [Sun, 20 Sep 2015 12:34:47 +0000 (14:34 +0200)]
ceph-disk: move update_partition from main_prepare to prepare_dev

The update_partition call in main_prepare happens immediately after
prepare_dev but only if the data argument is a block device. There is no
reason for this separation: it is more sensible to call it from within
prepare_dev.

There is an additional test in prepare_dev that verifies partprobe won't
be called on a partition because it would not make sense.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: guard partprobe with udevadm settle
Loic Dachary [Sun, 20 Sep 2015 12:30:52 +0000 (14:30 +0200)]
ceph-disk: guard partprobe with udevadm settle

Call udevadm settle before and after partprobe.

A side effect of partprobe is to remove partitions and add them again.
The first udevadm settle waits for ongoing udev events to complete, just
in case one of them rely on an existing partition on dev.

The second udevadm settle guarantees to the caller that all udev events
related to the partition table change have been processed, i.e. the
95-ceph-osd.rules actions and mode changes, group changes etc. are
complete.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: do not hide ceph-disk prepare stack trace
Loic Dachary [Sun, 20 Sep 2015 12:28:12 +0000 (14:28 +0200)]
ceph-disk: do not hide ceph-disk prepare stack trace

raise without an argument so the original stack trace is shown when
ceph-disk prepare fails.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: support --verbose with --log-stdout
Loic Dachary [Sun, 20 Sep 2015 12:23:47 +0000 (14:23 +0200)]
ceph-disk: support --verbose with --log-stdout

Set the LOG level as well as the channel level, otherwise the debug
messages are trimmed before they reach the channel. Also set the prefix
while we're at it.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: prefer sgdisk to blkid to retrieve partition UUID
Loic Dachary [Sun, 20 Sep 2015 12:16:12 +0000 (14:16 +0200)]
ceph-disk: prefer sgdisk to blkid to retrieve partition UUID

blkid 2.23.2 which is the default for official CentOS 7 cloud images
fails on journal device. It would be better to use blkid because it does
not trigger udev events, but it is more important to get reliable
results.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: make ceph-disk list /dev/vdb equivalent to list vdb
Loic Dachary [Sun, 20 Sep 2015 12:12:25 +0000 (14:12 +0200)]
ceph-disk: make ceph-disk list /dev/vdb equivalent to list vdb

The ceph-disk list argument must be the device name without the leading
/dev/. This is error prone and silently does nothing. Strip the /dev/
prefix of ceph-disk list arguments so that it behaves as expected.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: - is translated into / with systemd
Loic Dachary [Sun, 20 Sep 2015 12:03:39 +0000 (14:03 +0200)]
ceph-disk: - is translated into / with systemd

When running ceph-disk trigger /dev/dm-1 with systemd, the path name is
translated into /dev/dm/1 because of systemd escape rules. Explicitly
translate - into \x2d for systemd to preserve the -.

It would be better to use systemd-escape
http://www.freedesktop.org/software/systemd/man/systemd-escape.html
but it does not appear to be generally available on CentOS 7 and
probably other distributions.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: a journal partition may survive a data partition
Loic Dachary [Sun, 20 Sep 2015 12:00:16 +0000 (14:00 +0200)]
ceph-disk: a journal partition may survive a data partition

When a data partition is removed and the journal partition is not
removed, ceph-disk list will not find a journal_for information and
should just ignore it.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: upstart must not run ceph-disk activate concurrently
Loic Dachary [Sun, 20 Sep 2015 19:48:11 +0000 (21:48 +0200)]
ceph-disk: upstart must not run ceph-disk activate concurrently

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: systemd must not kill a running ceph-disk
Loic Dachary [Sun, 20 Sep 2015 11:54:05 +0000 (13:54 +0200)]
ceph-disk: systemd must not kill a running ceph-disk

When activating a device, ceph-disk trigger restarts the ceph-disk
systemd service. Two consecutive udev add on the same device will
restart the ceph-disk systemd service and the second one may kill the
first one, leaving the device half activated.

The ceph-disk systemd service is instructed to not kill an existing
process when restarting. The second run waits (via flock) for the second
one to complete before running so that they do not overlap.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: fix typos in udev rules
Loic Dachary [Sun, 20 Sep 2015 11:52:59 +0000 (13:52 +0200)]
ceph-disk: fix typos in udev rules

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: ensure ceph owner on udev change
Loic Dachary [Sun, 20 Sep 2015 11:50:03 +0000 (13:50 +0200)]
ceph-disk: ensure ceph owner on udev change

On udev change the owner of the device switch back to the default. If
that happens on a journal while an OSD is being activated, it will fail
with permission denied.

Make sure all ceph device types are chown to ceph on udev change.

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

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>