]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agomds: fix error_str formatting in scrub output 4103/head
John Spray [Thu, 19 Mar 2015 13:15:24 +0000 (13:15 +0000)]
mds: fix error_str formatting in scrub output

operator<< on an ostringstream actually gets
you an address.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4025 from ceph/wip-fix-configure-noversion
Loic Dachary [Thu, 19 Mar 2015 10:16:43 +0000 (11:16 +0100)]
Merge pull request #4025 from ceph/wip-fix-configure-noversion

configure.ac: add --disable-gitversion

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoconfigure.ac: add --disable-gitversion 4025/head
Danny Al-Gaaf [Thu, 12 Mar 2015 21:17:09 +0000 (22:17 +0100)]
configure.ac: add --disable-gitversion

During development each git commit cause currently a complete
rebuild of the source tree. By passing --disable-gitversion to
configure we set a generic version string for ceph to prevent
getting after each commit a new version set.

remove src/check_version and replace with a extended version
of src/make_version which allows detecting changes in .git_version
and ceph_ver.h to avoid not needed updates.

This change also forces to call make_version each time to make
sure that changes from configure or the NO_VERSION env variable
are processed.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoMerge pull request #3951 from ceph/wip-cephfs-snaps
Gregory Farnum [Wed, 18 Mar 2015 21:31:51 +0000 (14:31 -0700)]
Merge pull request #3951 from ceph/wip-cephfs-snaps

Wip cephfs snaps

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4072 from javierguerragiraldez/master
Josh Durgin [Wed, 18 Mar 2015 20:53:07 +0000 (13:53 -0700)]
Merge pull request #4072 from javierguerragiraldez/master

rados.py: fix Object.write() method

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agorados.py: fix Object.write() method 4072/head
Javier Guerra [Wed, 18 Mar 2015 19:46:13 +0000 (14:46 -0500)]
rados.py: fix Object.write() method

the file position should advance by the number of bytes written,
but the ioctx.write() function returns 0 on success

Signed-off-by: Javier Guerra <javier@guerrag.com>
10 years agoMerge pull request #4067 from ceph/wip-rbd-warning
Haomai Wang [Wed, 18 Mar 2015 16:44:48 +0000 (00:44 +0800)]
Merge pull request #4067 from ceph/wip-rbd-warning

tests: remove unused variable

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agotests: remove unused variable 4067/head
Josh Durgin [Wed, 18 Mar 2015 16:06:38 +0000 (09:06 -0700)]
tests: remove unused variable

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agomds: skip inode that is being puring when opening snap past parent 3951/head
Yan, Zheng [Tue, 17 Mar 2015 12:31:14 +0000 (20:31 +0800)]
mds: skip inode that is being puring when opening snap past parent

we can not increase reference count of purging inodes. purging
inodes have no snapshots, so it's OK to skip them.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: don't crash MDS when snapshot data not found
Yan, Zheng [Mon, 16 Mar 2015 10:44:49 +0000 (18:44 +0800)]
mds: don't crash MDS when snapshot data not found

When remote dentry and inode are in different snapshot realms.
The inode may not contain snapshot data for snapshot of the remote
dentry.

This issue are difficult to fix. This patch MDS print an error
instead of triggering assersion.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: pick head inode when caps follows is zero
Yan, Zheng [Sat, 14 Mar 2015 01:21:01 +0000 (09:21 +0800)]
mds: pick head inode when caps follows is zero

"caps follows is zero" means client does not flush anything, so
we shoud pick the head object

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: fix purging snapshotted stray inode
Yan, Zheng [Tue, 10 Mar 2015 11:13:30 +0000 (19:13 +0800)]
mds: fix purging snapshotted stray inode

If stray inode has no snapshot data, it's OK to purge it even if
it's still referenced by some snapsthots. This is because seperate
snap inodes were created for snapshots.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: check snapset in journal_cow_dentry()
Yan, Zheng [Tue, 10 Mar 2015 04:01:32 +0000 (12:01 +0800)]
mds: check snapset in journal_cow_dentry()

Removing snapshot also increases snaprealm's sequence number.
So only using snaprealm's sequence number to decide if we should
COW dentry is too loose. This patch makes journal_cow_dentry()
also check snaprealm's snapset.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: fix fnode.snap_purged_thru check
Yan, Zheng [Wed, 18 Mar 2015 06:12:50 +0000 (14:12 +0800)]
mds: fix fnode.snap_purged_thru check

We do not alway succeed in purging all stale snap dentries
(stale snap dentris can be in-use or have been trimmed from
cache). Updating fnode.snap_purged_thru prematurely will make
us not purge the remainning stale snap dentries. If CDir
has no cached snap dentry when fetching dirfrag, we can
guaranee that all stale snap dentries will be purged.
So we only update fnode.snap_purged_thru in this case.

Now the code that purges stale snap dentries is executed more
frequently. So this patch also make readdir not purge stale
snap dentries

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: purge stale snap data in CInode with snaprealm
Yan, Zheng [Tue, 10 Mar 2015 03:58:31 +0000 (11:58 +0800)]
mds: purge stale snap data in CInode with snaprealm

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: fix purging stale snapshot dentries
Yan, Zheng [Tue, 10 Mar 2015 03:39:25 +0000 (11:39 +0800)]
mds: fix purging stale snapshot dentries

When fetching dirfrag, record stale snap dentries in CDir. So that
CDir::_omap_commit can remove these stale dentires from OMAP.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #3904 from yuyuyu101/wip-librbd-metadata
Josh Durgin [Wed, 18 Mar 2015 03:42:18 +0000 (20:42 -0700)]
Merge pull request #3904 from yuyuyu101/wip-librbd-metadata

Wip librbd metadata

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4013 from ceph/wip-5488
Josh Durgin [Wed, 18 Mar 2015 02:53:54 +0000 (19:53 -0700)]
Merge pull request #4013 from ceph/wip-5488

librbd: fix deadlock on image refresh

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoLibrbd: Add "start" and "max" arguments to metadata_list 3904/head
Haomai Wang [Tue, 17 Mar 2015 15:41:05 +0000 (23:41 +0800)]
Librbd: Add "start" and "max" arguments to metadata_list

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #3953 from wuxingyi/patch-2
Ken Dreyer [Wed, 18 Mar 2015 02:51:22 +0000 (20:51 -0600)]
Merge pull request #3953 from wuxingyi/patch-2

rgw/logrotate.conf: Rename service name

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agorgw/logrotate.conf: Rename service name 3953/head
wuxingyi [Wed, 11 Mar 2015 09:34:40 +0000 (17:34 +0800)]
rgw/logrotate.conf: Rename service name

The service name for ceph rados gateway was changed to "ceph-radosgw",
the previous version of service name "radosgw" would cause a failed reload,
and finally make it impossible to write any log data to the log file.

Signed-off-by: wuxingyi <wuxingyi2015@outlook.com>
10 years agoMerge pull request #4055 from vuhuong/wip-xio
Sage Weil [Tue, 17 Mar 2015 23:24:33 +0000 (16:24 -0700)]
Merge pull request #4055 from vuhuong/wip-xio

XIO fixes

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agodoc/release-notes: v0.67.11 draft notes
Sage Weil [Tue, 17 Mar 2015 23:14:15 +0000 (16:14 -0700)]
doc/release-notes: v0.67.11 draft notes

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4045 from NTmatter/docs-raid4-removal
Loic Dachary [Tue, 17 Mar 2015 17:56:55 +0000 (18:56 +0100)]
Merge pull request #4045 from NTmatter/docs-raid4-removal

doc-rados-operations-crush-map: Swap Raid4 for Erasure

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge remote-tracking branch 'gh/hammer'
Sage Weil [Tue, 17 Mar 2015 17:57:13 +0000 (10:57 -0700)]
Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock
src/msg/xio/XioPortal.h

10 years agoMerge pull request #3910 from athanatos/wip-11027
Samuel Just [Tue, 17 Mar 2015 17:28:56 +0000 (10:28 -0700)]
Merge pull request #3910 from athanatos/wip-11027

Wip 11027

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3918 from tchaikov/hammer-fix-leaks-in-C_TwoContexts
Samuel Just [Tue, 17 Mar 2015 17:28:19 +0000 (10:28 -0700)]
Merge pull request #3918 from tchaikov/hammer-fix-leaks-in-C_TwoContexts

osdc: fix a memory leak in C_TwoContexts

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3972 from tchaikov/hammer-fix-msg-leak
Samuel Just [Tue, 17 Mar 2015 17:27:06 +0000 (10:27 -0700)]
Merge pull request #3972 from tchaikov/hammer-fix-msg-leak

osd: fix a msg leak

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3994 from athanatos/wip-11069
Samuel Just [Tue, 17 Mar 2015 17:15:46 +0000 (10:15 -0700)]
Merge pull request #3994 from athanatos/wip-11069

PGLog: split divergent priors as well

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
10 years agodoc-rados-operations-crush-map: Swap Raid4 for Erasure 4045/head
Thomas Johnson [Tue, 17 Mar 2015 16:32:24 +0000 (17:32 +0100)]
doc-rados-operations-crush-map: Swap Raid4 for Erasure

Signed-off-by: Thomas Johnson <NTmatter@gmail.com>
10 years agoMerge pull request #4001 from rzarzynski/wip-10650
Yehuda Sadeh [Tue, 17 Mar 2015 15:25:45 +0000 (08:25 -0700)]
Merge pull request #4001 from rzarzynski/wip-10650

rgw: send Last-Modified header in response for PUT on Swift's object.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3925 from rzarzynski/wip-11088
Yehuda Sadeh [Tue, 17 Mar 2015 15:11:40 +0000 (08:11 -0700)]
Merge pull request #3925 from rzarzynski/wip-11088

rgw: fix handling empty metadata items on Swift container.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoxio: Add xio_transport_type 4055/head
Vu Pham [Tue, 17 Mar 2015 12:17:01 +0000 (05:17 -0700)]
xio: Add xio_transport_type

Add xio_transport_type to control and run xio messenger over
rdma or tcp

Signed-off-by: Vu Pham <vu@mellanox.com>
10 years agoxio: Update README.xio with dependencies
Vu Pham [Tue, 17 Mar 2015 12:13:57 +0000 (05:13 -0700)]
xio: Update README.xio with dependencies

Signed-off-by: Vu Pham <vu@mellanox.com>
10 years agoMerge pull request #4024 from ceph/wip-unused-var
Loic Dachary [Tue, 17 Mar 2015 08:59:49 +0000 (09:59 +0100)]
Merge pull request #4024 from ceph/wip-unused-var

mds: remove double-define on iterator

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomds: remove double-define on iterator 4024/head
John Spray [Tue, 17 Mar 2015 08:20:54 +0000 (08:20 +0000)]
mds: remove double-define on iterator

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3976 from wonzhq/hit-set-check
Kefu Chai [Tue, 17 Mar 2015 07:05:47 +0000 (15:05 +0800)]
Merge pull request #3976 from wonzhq/hit-set-check

osd/ReplicatePG: correctly checking if an object is in hit set

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4017 from ceph/wip-11125
Josh Durgin [Tue, 17 Mar 2015 01:27:12 +0000 (18:27 -0700)]
Merge pull request #4017 from ceph/wip-11125

rgw: update keystone cache with token info

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4019 from NTmatter/doc-typo-monap
Loic Dachary [Mon, 16 Mar 2015 23:01:10 +0000 (00:01 +0100)]
Merge pull request #4019 from NTmatter/doc-typo-monap

doc/rados/operations/add-or-rm-mons: correcting minor typo

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc/rados/operations/add-or-rm-mons: correcting minor typo 4019/head
Thomas Johnson [Mon, 16 Mar 2015 22:20:01 +0000 (23:20 +0100)]
doc/rados/operations/add-or-rm-mons: correcting minor typo

Signed-off-by: Thomas Johnson <NTmatter@gmail.com>
10 years agoPGLog: split divergent priors as well 3994/head
Samuel Just [Mon, 9 Mar 2015 15:25:27 +0000 (08:25 -0700)]
PGLog: split divergent priors as well

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agorgw: update keystone cache with token info 4017/head
Yehuda Sadeh [Tue, 3 Mar 2015 19:03:35 +0000 (11:03 -0800)]
rgw: update keystone cache with token info

Fixes: #11125
Backport: hammer, firefly

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3997 from ceph/wip-debian-mv-var-lib-ceph-mds
Sage Weil [Mon, 16 Mar 2015 20:00:52 +0000 (13:00 -0700)]
Merge pull request #3997 from ceph/wip-debian-mv-var-lib-ceph-mds

debian: move /var/lib/ceph/mds to ceph-mds package

Reviewed-by: James Page <james.page@ubuntu.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3945 from tchaikov/hammer-fix-xio-requeue
Sage Weil [Mon, 16 Mar 2015 19:50:49 +0000 (12:50 -0700)]
Merge pull request #3945 from tchaikov/hammer-fix-xio-requeue

XIO: Handle requeue case of XIO messages

10 years agoMerge pull request #3977 from tchaikov/fix-xio-loop-conn-cleanup
Sage Weil [Mon, 16 Mar 2015 19:48:35 +0000 (12:48 -0700)]
Merge pull request #3977 from tchaikov/fix-xio-loop-conn-cleanup

Fix XioLoopbackConnection Lifecycle.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3872 from dachary/wip-7334-partx-test
Loic Dachary [Mon, 16 Mar 2015 18:21:23 +0000 (19:21 +0100)]
Merge pull request #3872 from dachary/wip-7334-partx-test

ceph-disk: test activate on the second journal

Reviewed-by: Alfredo Deza <adeza@redhat.com>
10 years agoMerge pull request #4014 from ceph/wip-mon-doc
Loic Dachary [Mon, 16 Mar 2015 17:52:50 +0000 (18:52 +0100)]
Merge pull request #4014 from ceph/wip-mon-doc

doc/rados/operations/add-or-rm-mons: revise doc a bit to be less confusing

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3922 from ceph/wip-11053
John Spray [Mon, 16 Mar 2015 17:32:29 +0000 (13:32 -0400)]
Merge pull request #3922 from ceph/wip-11053

mds: fix assertion caused by system clock backwards

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3752 from ceph/wip-10744
John Spray [Mon, 16 Mar 2015 17:06:49 +0000 (13:06 -0400)]
Merge pull request #3752 from ceph/wip-10744

mds: give up replicas of a stopping mds's stuff

Reviewed-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: give up replicas of a stopping mds's stuff 3752/head
John Spray [Tue, 10 Mar 2015 14:40:30 +0000 (14:40 +0000)]
mds: give up replicas of a stopping mds's stuff

In order for an MDS to make it through stopping when
it had some strays, the other ranks that serviced
the migrate_stray renames must ensure that they
give up any cache objects that belonged to
the stopping MDS, so that the stopping MDS
can finish emptying its cache.

Fixes: #10744
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agodoc/rados/operations/add-or-rm-mons: revise doc a bit to be less confusing 4014/head
Sage Weil [Mon, 16 Mar 2015 16:32:22 +0000 (09:32 -0700)]
doc/rados/operations/add-or-rm-mons: revise doc a bit to be less confusing

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agodebian: move /var/lib/ceph/mds to ceph-mds package 3997/head
Ken Dreyer [Mon, 16 Mar 2015 16:11:43 +0000 (10:11 -0600)]
debian: move /var/lib/ceph/mds to ceph-mds package

On Debian, ceph-mds was split out into its own package in
9d6013e0db47b258cbcde4c692554a2764812099, but the /var/lib/ceph/mds
directory was not moved along with the rest of the mds pieces.

The /var/lib/ceph/mds directory is only necessary if a user has
installed ceph-mds. Move it to the ceph-mds subpackage.

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agolibrbd: acquire cache_lock before refreshing parent 4013/head
Jason Dillaman [Mon, 16 Mar 2015 15:04:22 +0000 (11:04 -0400)]
librbd: acquire cache_lock before refreshing parent

cache_lock needs to be acquired before snap_lock to avoid
the potential for deadlock.

Fixes: #5488
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados_test_stub: AIO operation callbacks should be via Finisher
Jason Dillaman [Fri, 13 Mar 2015 22:08:47 +0000 (18:08 -0400)]
librados_test_stub: AIO operation callbacks should be via Finisher

librados will execute all AIO callbacks via a single finisher to
prevent blocking the Objecter.  Reproduce this behavior to avoid
deadlocks that only exist when using the test stub.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4002 from zhicheng/master
Loic Dachary [Mon, 16 Mar 2015 08:03:00 +0000 (09:03 +0100)]
Merge pull request #4002 from zhicheng/master

fix doc/dev/network-protocol.rst typo

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4007 from dachary/wip-warnings
Kefu Chai [Mon, 16 Mar 2015 07:33:53 +0000 (15:33 +0800)]
Merge pull request #4007 from dachary/wip-warnings

fix a few minor compilation warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agofix a few minor compilation warnings 4007/head
Loic Dachary [Sun, 15 Mar 2015 23:14:00 +0000 (00:14 +0100)]
fix a few minor compilation warnings

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agofix doc/dev/network-protocol.rst typo 4002/head
Zhicheng Wei [Sun, 15 Mar 2015 04:12:26 +0000 (12:12 +0800)]
fix doc/dev/network-protocol.rst typo

Signed-off-by: Zhicheng Wei <zhicheng@opensourceforge.net>
10 years agoMerge pull request #3989 from javacruft/wip/fixup-cycles-crossarch
Sage Weil [Mon, 16 Mar 2015 01:12:34 +0000 (18:12 -0700)]
Merge pull request #3989 from javacruft/wip/fixup-cycles-crossarch

Add support for PPC architecture, provide fallback

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4006 from dachary/wip-documentation
Loic Dachary [Sun, 15 Mar 2015 22:31:40 +0000 (23:31 +0100)]
Merge pull request #4006 from dachary/wip-documentation

doc: mark the ascii schema as a literal block

Reviewed-by: Yann Dupont <yann@objoo.org>
10 years agodoc: mark the ascii schema as a literal block 4006/head
Loic Dachary [Sun, 15 Mar 2015 21:47:59 +0000 (22:47 +0100)]
doc: mark the ascii schema as a literal block

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4005 from dachary/wip-releases
Loic Dachary [Sun, 15 Mar 2015 21:39:39 +0000 (22:39 +0100)]
Merge pull request #4005 from dachary/wip-releases

doc: release timeline

Reviewed-by: Yann Dupont <yann@objoo.org>
10 years agoMerge pull request #3990 from zaitcev/first_contrib
Loic Dachary [Sun, 15 Mar 2015 21:13:50 +0000 (22:13 +0100)]
Merge pull request #3990 from zaitcev/first_contrib

Specify the actual struct used in protocol handshake

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3992 from ceph/wip-package-perf-objectstore
Loic Dachary [Sun, 15 Mar 2015 21:12:05 +0000 (22:12 +0100)]
Merge pull request #3992 from ceph/wip-package-perf-objectstore

packaging: include ceph_perf_objectstore

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
10 years agodoc: release timeline 4005/head
Loic Dachary [Sun, 15 Mar 2015 20:59:14 +0000 (21:59 +0100)]
doc: release timeline

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agorgw: send Last-Modified header in response for PUT on Swift object. 4001/head
Radoslaw Zarzynski [Fri, 13 Mar 2015 20:41:45 +0000 (21:41 +0100)]
rgw: send Last-Modified header in response for PUT on Swift object.

Fixes: #10650
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
10 years agoMerge pull request #3982 from dzafman/wip-10678-2
David Zafman [Sat, 14 Mar 2015 00:58:56 +0000 (17:58 -0700)]
Merge pull request #3982 from dzafman/wip-10678-2

Update ceph.8 man page to match ceph -h output

Reviewed-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Fix ceph command manpage to match ceph -h (hammer) 3982/head
David Zafman [Thu, 12 Mar 2015 21:55:54 +0000 (14:55 -0700)]
doc: Fix ceph command manpage to match ceph -h (hammer)

Include rebuilt man/ceph.8

Fixes: #10678
Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agodoc: Fix ceph command manpage to match ceph -h (firefly)
David Zafman [Thu, 12 Mar 2015 18:39:52 +0000 (11:39 -0700)]
doc: Fix ceph command manpage to match ceph -h (firefly)

Improve synopsis section
Fixes: #10676
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9ac488c1eb0e30511079ba05aaf11c79615b3940)

Conflicts:

doc/man/8/ceph.rst
man/ceph.8

10 years agoPGBackend: do not rewrite ec object oi checksums 3910/head
Samuel Just [Sat, 7 Mar 2015 02:30:41 +0000 (18:30 -0800)]
PGBackend: do not rewrite ec object oi checksums

Deep scrub does not actually give us the whole-object checksum for an ec
object, only the checksum for the first shard.  We ignore it in scrub
for ec pools anyway in be_select_auth_object.

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoPGBackend: add debug option to rewrite digest even if present
Samuel Just [Fri, 6 Mar 2015 00:31:15 +0000 (16:31 -0800)]
PGBackend: add debug option to rewrite digest even if present

Related: #11027
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG: finish_ctx: do not assume that the oi is for the head object
Samuel Just [Thu, 5 Mar 2015 21:59:41 +0000 (13:59 -0800)]
ReplicatedPG: finish_ctx: do not assume that the oi is for the head object

If we are setting the oi on the clone object, we want to update the
mod_desc.

Fixes: 11027
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agopackaging: include ceph_perf_objectstore 3992/head
Ken Dreyer [Fri, 13 Mar 2015 22:08:35 +0000 (16:08 -0600)]
packaging: include ceph_perf_objectstore

The /usr/bin/ceph_perf_objectstore file is installed by default. Prior
to this commit it was missing from the packaging. This caused the RPM to
fail to build in mock.

Add ceph_perf_objectstore to the "ceph-test" RPM and Debian package.

If we end up developing further ceph_perf_* utilities, it would make
sense to glob them all with a wildcard, similar to what we are doing
with all the ceph_test_* utilities in ceph-test.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoSpecify the actual struct used in protocol handshake 3990/head
Pete Zaitcev [Fri, 13 Mar 2015 20:13:02 +0000 (14:13 -0600)]
Specify the actual struct used in protocol handshake

Maybe it was sockaddr_storage in an older version, but it is
definitely entity_addr_t in "ceph v027".

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
10 years agoAdd support for PPC architecture, provide fallback 3989/head
James Page [Fri, 13 Mar 2015 19:46:04 +0000 (19:46 +0000)]
Add support for PPC architecture, provide fallback

Add high precision cpu cycles support for powerpc and powerpc64.

Provide a fallback for other architectures and warn during
compilation.

Signed-off-by: James Page <james.page@ubuntu.com>
10 years agoMerge pull request #3957 from xinxinsh/wip-cleanup
Kefu Chai [Fri, 13 Mar 2015 16:28:08 +0000 (00:28 +0800)]
Merge pull request #3957 from xinxinsh/wip-cleanup

os/{Level,Rocks}DBStore: cleanup in_prefix function

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3985 from fmarsylle/master
Kefu Chai [Fri, 13 Mar 2015 15:33:26 +0000 (23:33 +0800)]
Merge pull request #3985 from fmarsylle/master

doc: s/that will called every time/that will be called every time/

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agolibrbd: Make metadata_set support multi kv pairs
Haomai Wang [Fri, 13 Mar 2015 13:45:55 +0000 (21:45 +0800)]
librbd: Make metadata_set support multi kv pairs

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agolibrbd: Fix typo and prefix ++
Haomai Wang [Fri, 13 Mar 2015 13:27:55 +0000 (21:27 +0800)]
librbd: Fix typo and prefix ++

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agolibrbd: Make image metadata copied during image copy
Haomai Wang [Tue, 10 Mar 2015 09:44:09 +0000 (17:44 +0800)]
librbd: Make image metadata copied during image copy

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agocls_rbd: Fix incorrect assert for prefix metadata key
Haomai Wang [Mon, 9 Mar 2015 10:07:21 +0000 (18:07 +0800)]
cls_rbd: Fix incorrect assert for prefix metadata key

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agotest_cli: update rbd client help description
Haomai Wang [Mon, 9 Mar 2015 08:02:55 +0000 (16:02 +0800)]
test_cli: update rbd client help description

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agolibrbd: Add tests for metadata get operation
Haomai Wang [Mon, 9 Mar 2015 07:28:04 +0000 (15:28 +0800)]
librbd: Add tests for metadata get operation

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agolibrbd: Add metadata_get method to support single metadata key retrieve
Haomai Wang [Mon, 9 Mar 2015 07:19:04 +0000 (15:19 +0800)]
librbd: Add metadata_get method to support single metadata key retrieve

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agolibrbd: Make metadata support clone operation
Haomai Wang [Mon, 9 Mar 2015 06:13:56 +0000 (14:13 +0800)]
librbd: Make metadata support clone operation

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agorbd.cc: add metadata cli operations
Haomai Wang [Mon, 9 Mar 2015 03:59:05 +0000 (11:59 +0800)]
rbd.cc: add metadata cli operations

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agotest_librbd: Add librbd interface tests for metadata
Haomai Wang [Mon, 9 Mar 2015 03:54:01 +0000 (11:54 +0800)]
test_librbd: Add librbd interface tests for metadata

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agotest_cls_rbd: add metadata cls tests
Haomai Wang [Mon, 9 Mar 2015 03:52:51 +0000 (11:52 +0800)]
test_cls_rbd: add metadata cls tests

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agolibrbd: Add librbd interface impl and tracing for metadata
Haomai Wang [Mon, 9 Mar 2015 03:51:16 +0000 (11:51 +0800)]
librbd: Add librbd interface impl and tracing for metadata

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agolibrbd/internal: Add internal implementation for metatdata ops
Haomai Wang [Mon, 9 Mar 2015 02:57:49 +0000 (10:57 +0800)]
librbd/internal: Add internal implementation for metatdata ops

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoinclude/librbd: Add metadata interface to librbd
Haomai Wang [Mon, 9 Mar 2015 02:55:54 +0000 (10:55 +0800)]
include/librbd: Add metadata interface to librbd

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agocls_rbd: Add cls rbd implementation for librbd metadata
Haomai Wang [Mon, 9 Mar 2015 02:50:06 +0000 (10:50 +0800)]
cls_rbd: Add cls rbd implementation for librbd metadata

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agocls_rbd_client: Add cls rbd client interface to support rbd metadata
Haomai Wang [Mon, 9 Mar 2015 02:40:54 +0000 (10:40 +0800)]
cls_rbd_client: Add cls rbd client interface to support rbd metadata

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #3986 from Al3xis-N/master
Loic Dachary [Fri, 13 Mar 2015 14:17:05 +0000 (15:17 +0100)]
Merge pull request #3986 from Al3xis-N/master

doc: How to generate an object corpus : should be a subsection

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: How to generate an object corpus : should be a subsection 3986/head
smagtony@gmail.com [Fri, 13 Mar 2015 12:49:23 +0000 (13:49 +0100)]
doc: How to generate an object corpus : should be a subsection

Fixes: #11099
Signed-off-by: Alexis Normand <n.al3xis@gmail.com>
10 years agoMerge pull request #3987 from RobinDehu/master
Loic Dachary [Fri, 13 Mar 2015 14:09:26 +0000 (15:09 +0100)]
Merge pull request #3987 from RobinDehu/master

doc: extra \ in CEPH\_AUTH\_UNKNOWN

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: s/that will called every time/that will be called every time/ 3985/head
florian [Fri, 13 Mar 2015 13:02:09 +0000 (14:02 +0100)]
doc: s/that will called every time/that will be called every time/

fixes: #11098

Signed-off-by: florian marsylle <florian.marsylle@hotmail.fr>
10 years agodoc: extra \ in CEPH\_AUTH\_UNKNOWN 3987/head
dehu robin [Fri, 13 Mar 2015 11:53:57 +0000 (12:53 +0100)]
doc: extra \ in CEPH\_AUTH\_UNKNOWN

Suppress all \

fixes: #11097

Signed-off-by: DEHU Robin <robindehu@gmail.com>
10 years agomds: disable snapshot rstat temporarily
Yan, Zheng [Tue, 10 Mar 2015 03:21:22 +0000 (11:21 +0800)]
mds: disable snapshot rstat temporarily

that code that propagates snapshot rstat is buggy and
difficult to fix. (the main problem this code causes is
that snapshot rstat is always propagated to parent node,
which results large size of CInode:old_inodes).

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: pin inode when openning snap parent
Yan, Zheng [Tue, 10 Mar 2015 03:11:15 +0000 (11:11 +0800)]
mds: pin inode when openning snap parent

make sure SnapRealm not get freed before C_SR_RetryOpenParents
get executed.

Signed-off-by: Yan, Zheng <zyan@redhat.com>