]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoMerge pull request #3893 from ceph/wip-10390
Gregory Farnum [Mon, 23 Mar 2015 18:17:42 +0000 (11:17 -0700)]
Merge pull request #3893 from ceph/wip-10390

#10390: Refactor stray handling code and add throttling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3371 from nilamdyuti/wip-doc-ceph-object-gateway
Loic Dachary [Mon, 23 Mar 2015 17:25:41 +0000 (18:25 +0100)]
Merge pull request #3371 from nilamdyuti/wip-doc-ceph-object-gateway

Updates radosgw man page with configuration for mod_proxy_fcgi

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #4137 from majianpeng/assert-version
Sage Weil [Mon, 23 Mar 2015 16:21:43 +0000 (09:21 -0700)]
Merge pull request #4137 from majianpeng/assert-version

osd/ReplicatedPG: For CEPH_OSD_OP_ASSERT_VER, it should use

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4141 from tchaikov/sync-rst-with-manpages
Loic Dachary [Mon, 23 Mar 2015 15:45:21 +0000 (16:45 +0100)]
Merge pull request #4141 from tchaikov/sync-rst-with-manpages

doc: update .rst file with their .8 counterparts

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4117 from ceph/wip-libcephfs-flock
Gregory Farnum [Mon, 23 Mar 2015 14:14:36 +0000 (07:14 -0700)]
Merge pull request #4117 from ceph/wip-libcephfs-flock

Fixes for libcephfs flock tests

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agodoc: Adds updated radosgw-admin man page under man/ 3371/head
Nilamdyuti Goswami [Thu, 22 Jan 2015 18:23:50 +0000 (23:53 +0530)]
doc: Adds updated radosgw-admin man page under man/

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates radosgw-admin man page.
Nilamdyuti Goswami [Thu, 22 Jan 2015 18:21:52 +0000 (23:51 +0530)]
doc: Updates radosgw-admin man page.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Adds updated radosgw man page under man/
Nilamdyuti Goswami [Tue, 20 Jan 2015 16:28:00 +0000 (21:58 +0530)]
doc: Adds updated radosgw man page under man/

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates radosgw man page.
Nilamdyuti Goswami [Tue, 20 Jan 2015 16:26:14 +0000 (21:56 +0530)]
doc: Updates radosgw man page.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Adds updated radosgw man page under man/
Nilamdyuti Goswami [Wed, 14 Jan 2015 18:55:28 +0000 (00:25 +0530)]
doc: Adds updated radosgw man page under man/

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates radosgw man page with configuration for mod_proxy_fcgi .
Nilamdyuti Goswami [Wed, 14 Jan 2015 18:53:17 +0000 (00:23 +0530)]
doc: Updates radosgw man page with configuration for mod_proxy_fcgi .

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agomds: be fairer in enqueuing purges 3893/head
John Spray [Fri, 20 Mar 2015 21:09:43 +0000 (21:09 +0000)]
mds: be fairer in enqueuing purges

Don't let purges that require fewer ops skip ahead of those
that require more ops.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agodoc: update .rst file with their .8 counterparts 4141/head
Kefu Chai [Mon, 23 Mar 2015 03:59:40 +0000 (11:59 +0800)]
doc: update .rst file with their .8 counterparts

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoosd/ReplicatedPG: For CEPH_OSD_OP_ASSERT_VER, it should use 4137/head
Jianpeng Ma [Mon, 23 Mar 2015 07:12:23 +0000 (15:12 +0800)]
osd/ReplicatedPG: For CEPH_OSD_OP_ASSERT_VER, it should use
op.assert_ver rather than op.watch.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #4135 from ceph/wip-11198
Haomai Wang [Sun, 22 Mar 2015 16:01:08 +0000 (00:01 +0800)]
Merge pull request #4135 from ceph/wip-11198

Fix ceph_test_async_driver failed

10 years agoFix ceph_test_async_driver failed 4135/head
Haomai Wang [Sun, 22 Mar 2015 15:59:19 +0000 (23:59 +0800)]
Fix ceph_test_async_driver failed

This test will create 10000 sockets which will failed because of limited system fd. Actually we only need to create several hundreds sockets and it's enough to get the test's goal.

Fix bug #11198

10 years agoMerge pull request #3873 from tchaikov/cli-human-readable-errno
Loic Dachary [Sun, 22 Mar 2015 08:19:58 +0000 (09:19 +0100)]
Merge pull request #3873 from tchaikov/cli-human-readable-errno

rados: translate errno to str in CLI

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3841 from ceph/wip-10217
Loic Dachary [Sun, 22 Mar 2015 08:08:21 +0000 (09:08 +0100)]
Merge pull request #3841 from ceph/wip-10217

qa/workunits/fs/misc: fix filelock_interrupt.py

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3829 from liewegas/wip-recovery-sleep
Loic Dachary [Sun, 22 Mar 2015 08:03:57 +0000 (09:03 +0100)]
Merge pull request #3829 from liewegas/wip-recovery-sleep

osd: inject simple sleep in recovery

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3685 from XinzeChi/wip-mark-started
Sage Weil [Sat, 21 Mar 2015 22:23:47 +0000 (15:23 -0700)]
Merge pull request #3685 from XinzeChi/wip-mark-started

osd: clear extra mark_started

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3282 from tchaikov/pq-test
Sage Weil [Sat, 21 Mar 2015 21:53:36 +0000 (14:53 -0700)]
Merge pull request #3282 from tchaikov/pq-test

common/PrioritizedQueue: add basic tests for it

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3177 from davidzhang84/wip-inject-eio-ec
Sage Weil [Sat, 21 Mar 2015 21:52:51 +0000 (14:52 -0700)]
Merge pull request #3177 from davidzhang84/wip-inject-eio-ec

Add EIO injection on EC pool for mdata and data error only for now

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3889 from XinzeChi/wip-tier-stat
Sage Weil [Sat, 21 Mar 2015 21:39:54 +0000 (14:39 -0700)]
Merge pull request #3889 from XinzeChi/wip-tier-stat

osd: add l_osd_op_cache_hit perf counter for cache pool

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4010 from majianpeng/osdmap-nspace
Sage Weil [Sat, 21 Mar 2015 21:39:35 +0000 (14:39 -0700)]
Merge pull request #4010 from majianpeng/osdmap-nspace

mon:make 'ceph osd map' accept namespace.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4130 from dachary/wip-backports
Loic Dachary [Sat, 21 Mar 2015 10:22:49 +0000 (11:22 +0100)]
Merge pull request #4130 from dachary/wip-backports

doc: what does it mean for a release to be supported

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agodoc: what does it mean for a release to be supported 4130/head
Loic Dachary [Sat, 21 Mar 2015 10:06:28 +0000 (11:06 +0100)]
doc: what does it mean for a release to be supported

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4122 from trhoden/rgw-quickstart
Sage Weil [Sat, 21 Mar 2015 00:45:38 +0000 (17:45 -0700)]
Merge pull request #4122 from trhoden/rgw-quickstart

doc: Add RGW quick start info

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4098 from ceph/wip-11128
Yehuda Sadeh [Sat, 21 Mar 2015 00:11:35 +0000 (17:11 -0700)]
Merge pull request #4098 from ceph/wip-11128

auth: reinitialize NSS modules after fork()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoauth: use crypto_init_mutex to protect NSS_Shutdown() 4098/head
Yan, Zheng [Fri, 20 Mar 2015 23:13:51 +0000 (07:13 +0800)]
auth: use crypto_init_mutex to protect NSS_Shutdown()

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agodoc: Add RGW quick start info 4122/head
Travis Rhoden [Fri, 20 Mar 2015 21:07:36 +0000 (17:07 -0400)]
doc: Add RGW quick start info

Add details of how to use ceph-deploy to deploy the CivetWeb-based
RGW present in Hammer.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
10 years agoMerge pull request #4120 from trhoden/quickstart-mon-create
Sage Weil [Fri, 20 Mar 2015 21:32:29 +0000 (14:32 -0700)]
Merge pull request #4120 from trhoden/quickstart-mon-create

doc: remove reference to old ceph-deploy steps

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agodoc: remove reference to old ceph-deploy steps 4120/head
Travis Rhoden [Fri, 20 Mar 2015 21:10:54 +0000 (17:10 -0400)]
doc: remove reference to old ceph-deploy steps

ceph-deploy 1.1.3 is ancient, and isn't easily found or installed.

No need to reference it and call out the steps necessary to use if
using it.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
10 years agoMerge pull request #4103 from ceph/wip-error-str
Gregory Farnum [Fri, 20 Mar 2015 17:59:26 +0000 (10:59 -0700)]
Merge pull request #4103 from ceph/wip-error-str

mds: fix error_str formatting in scrub output

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4116 from ceph/wip-10368
Gregory Farnum [Fri, 20 Mar 2015 17:50:56 +0000 (10:50 -0700)]
Merge pull request #4116 from ceph/wip-10368

mds: call wait_for_safe twice in command_flush_journal

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agomds: call wait_for_safe twice in command_flush_journal 4116/head
John Spray [Fri, 20 Mar 2015 17:11:39 +0000 (17:11 +0000)]
mds: call wait_for_safe twice in command_flush_journal

...so that we wait until everyone who was waiting for the first
wait_for_safe has run their completion before we proceed, thus
avoiding the possibility that those completions will execute
during our trimming and cause problems.

Fixes: #10368
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoauth: reinitialize NSS modules after fork()
Yan, Zheng [Fri, 20 Mar 2015 17:02:42 +0000 (01:02 +0800)]
auth: reinitialize NSS modules after fork()

Fixes: #11128
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoauth: properly return error of cephx_calc_client_server_challenge
Yan, Zheng [Fri, 20 Mar 2015 04:03:44 +0000 (12:03 +0800)]
auth: properly return error of cephx_calc_client_server_challenge

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: improved doxygen comments in StrayManager
John Spray [Tue, 17 Mar 2015 12:29:31 +0000 (12:29 +0000)]
mds: improved doxygen comments in StrayManager

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: update StrayManager op limit on mds_max_purge_ops_per_pg
John Spray [Tue, 17 Mar 2015 12:34:59 +0000 (12:34 +0000)]
mds: update StrayManager op limit on mds_max_purge_ops_per_pg

Previously was only updating on mds_max_purge_ops

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: fix parent check in MDCache::eval_remote
John Spray [Wed, 25 Feb 2015 10:55:42 +0000 (10:55 +0000)]
mds: fix parent check in MDCache::eval_remote

This code path wasn't touched until the change
in "mds/Server: fix stray reintegration".  Now we
see that it will crash in fsstress in some circumstances
when the client is doing a link operation, where
we are checking the projected linkage on the DN
before going into this function, but not the projected
parenthood of the inode.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: make purge op limit dynamic based on PGs/MDSs
John Spray [Tue, 10 Feb 2015 14:16:34 +0000 (14:16 +0000)]
mds: make purge op limit dynamic based on PGs/MDSs

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: throttle purge stray operations
John Spray [Tue, 20 Jan 2015 12:17:56 +0000 (12:17 +0000)]
mds: throttle purge stray operations

Pull out the stray-handling code into a separate StrayManager
class.

There is an additional improvement to stray reintegration here,
by passing the DN that triggered the reintegration through,
we should make a better choice about *which* hardlink to
reintegrate the inode into, rather than just picking the first.

Fixes: #10390
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agocommon/config_opts: add purge throttle options
John Spray [Tue, 20 Jan 2015 11:15:03 +0000 (11:15 +0000)]
common/config_opts: add purge throttle options

These are to be respected by the MDS in the number
of concurrent RADOS delete operations and
number of files to be purged at once.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoosdc: make op count in Filer::purge configurable
John Spray [Tue, 20 Jan 2015 11:12:45 +0000 (11:12 +0000)]
osdc: make op count in Filer::purge configurable

Previously this was simply hardcoded to do up to
10 RADOS delete ops at a time.  Make this a config
option so that Filer consumers (like the MDS) can
know how many concurrent operations will be done
on their behalf.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: eval stray on remove dentry replica
John Spray [Mon, 16 Feb 2015 17:03:42 +0000 (17:03 +0000)]
mds: eval stray on remove dentry replica

This happens because when handling an MCacheExpire,
we expire inodes first and then dentries, so when
the inodes are put() their dentries still are replicated
so eval_stray fails.  Do an explicit call to maybe_eval_stray
when handling the expire for the dentry in order to catch
this.

One hits this path when migrating a stray away from
a stopping MDS rank.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: expire other ranks' mydirs during 'stopping'
John Spray [Mon, 16 Feb 2015 17:01:43 +0000 (17:01 +0000)]
mds: expire other ranks' mydirs during 'stopping'

Avoids the surviving MDSs thinking their base dir is still
replicated after a rank has been stopped.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds/Server: fix stray reintegration
John Spray [Thu, 29 Jan 2015 19:00:21 +0000 (19:00 +0000)]
mds/Server: fix stray reintegration

This was checking tracei's primary parent DN for remoteness
as a condition to calling eval_remote.  However, the *primary*
parent DN in this case is the stray, which is not remote.

The correct check is tracedn (the remote dentry that got us here)
rather than tracei->get_parent_dn() (the primary dentry for the
inode that we have looked up).

This leads to eval_remote being invoked, and reintegration
of stray hard-linked inodes working.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4114 from apeters1971/wip-isa-lrucache
Loic Dachary [Fri, 20 Mar 2015 10:35:32 +0000 (11:35 +0100)]
Merge pull request #4114 from apeters1971/wip-isa-lrucache

erasure-code: make ErasureCodeIsaTableCache drop entries according to LRU

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: make ErasureCodeIsaTableCache drop entries according to LRU 4114/head
Andreas Peters [Fri, 20 Mar 2015 09:21:26 +0000 (10:21 +0100)]
erasure-code: make ErasureCodeIsaTableCache drop entries according to LRU

There was a bug in the arguments used by the splice function to move elements from the LRU list to the head of the list.
To simplify the implementation the direction of the LRU list has been changed e.g. newest entries are pushed in front.

Signed-off-by: Andreas-Joachim Peters <andreas.joachim.peters@cern.ch>
10 years agoMerge pull request #4084 from ceph/wip-switch-to-breathe
Loic Dachary [Fri, 20 Mar 2015 09:33:10 +0000 (10:33 +0100)]
Merge pull request #4084 from ceph/wip-switch-to-breathe

Wip switch to breathe

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: s/Asphyxiate/Breathe/ in documenting.rst 4084/head
Kefu Chai [Wed, 18 Mar 2015 03:52:18 +0000 (11:52 +0800)]
doc: s/Asphyxiate/Breathe/ in documenting.rst

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: enable doxygen for enum
Kefu Chai [Wed, 18 Mar 2015 03:51:10 +0000 (11:51 +0800)]
doc: enable doxygen for enum

* since we switched to breathe, which supports rendering enum
  types

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: Switch doxygen integration back to breathe
Kefu Chai [Tue, 17 Mar 2015 15:40:00 +0000 (23:40 +0800)]
doc: Switch doxygen integration back to breathe

* asphyxiate needs more toolings, see
  https://github.com/ceph/asphyxiate/issues/1
* this commit basically reverts c96064
* use `autodoxygen` directive to doxygen referenced source files
* do not call `doxygen` explicitly in `build-doc`, `autodoxygen`
  will take care of it.

Fixes: #6115
Fixes: #6115
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agotest/libcephfs/flock.cc: don't release lock before EWOULDBLOCK check 4117/head
Yan, Zheng [Thu, 19 Mar 2015 09:58:28 +0000 (17:58 +0800)]
test/libcephfs/flock.cc: don't release lock before EWOULDBLOCK check

make sure the main thread/process not release the file lock before
workers execute the operation that supposes to return EWOULDBLOCK.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agotest/libcephfs/flock.cc: fix synchronization points
Yan, Zheng [Thu, 19 Mar 2015 09:34:47 +0000 (17:34 +0800)]
test/libcephfs/flock.cc: fix synchronization points

In the threesome test cases, the main thread/process call PING_WORKER()
twice at each synchronization point. It's possible that one worker gets
both notifications and takes two steps forward, another worker gets no
notification.

The fix is use seperate semaphores for odd/even number synchronization
points.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #3983 from yuyuyu101/wip-async-fix-3
Haomai Wang [Fri, 20 Mar 2015 03:23:18 +0000 (11:23 +0800)]
Merge pull request #3983 from yuyuyu101/wip-async-fix-3

Wip async fix 3

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoThread.cc: Make set_affinity private and correct behavior 3983/head
Haomai Wang [Thu, 19 Mar 2015 06:56:23 +0000 (14:56 +0800)]
Thread.cc: Make set_affinity private and correct behavior

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agodoc/release-notes: more hammer release notes
Sage Weil [Fri, 20 Mar 2015 00:24:33 +0000 (17:24 -0700)]
doc/release-notes: more hammer release notes

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4085 from ceph/wip-11160
Sage Weil [Fri, 20 Mar 2015 00:19:59 +0000 (17:19 -0700)]
Merge pull request #4085 from ceph/wip-11160

rgw: don't use rgw_socket_path if frontend is configured

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agodoc/release-notes: make hammer note about filestore format upgrade
Sage Weil [Fri, 20 Mar 2015 00:16:15 +0000 (17:16 -0700)]
doc/release-notes: make hammer note about filestore format upgrade

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3885 from Ved-vampir/master
John Spray [Thu, 19 Mar 2015 22:05:31 +0000 (22:05 +0000)]
Merge pull request #3885 from Ved-vampir/master

common: add perf counters description

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3840 from ceph/wip-libcephfs-fsetxattr
John Spray [Thu, 19 Mar 2015 22:03:04 +0000 (22:03 +0000)]
Merge pull request #3840 from ceph/wip-libcephfs-fsetxattr

libcephfs: add ceph_f{get,set,list,remove)_xattr

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3750 from ceph/wip-dump-cache
John Spray [Thu, 19 Mar 2015 22:00:48 +0000 (22:00 +0000)]
Merge pull request #3750 from ceph/wip-dump-cache

mds: Add 'dump cache' asok

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agomds: implement 'dump cache' asok command 3750/head
John Spray [Tue, 17 Mar 2015 18:38:41 +0000 (18:38 +0000)]
mds: implement 'dump cache' asok command

Retains old text format output when user specifies
a filename, else returns JSON.  JSON output will
cope less well with large caches, but will be more
useful for automated tests.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: use MDSCacheObject::dump in CDir::dump
John Spray [Wed, 18 Mar 2015 11:20:31 +0000 (11:20 +0000)]
mds: use MDSCacheObject::dump in CDir::dump

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: add CDentry::dump
John Spray [Tue, 17 Mar 2015 18:43:42 +0000 (18:43 +0000)]
mds: add CDentry::dump

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: extended dump() for CInode
John Spray [Tue, 17 Mar 2015 18:42:09 +0000 (18:42 +0000)]
mds: extended dump() for CInode

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: add dump() to MDSCacheObject
John Spray [Tue, 17 Mar 2015 18:41:30 +0000 (18:41 +0000)]
mds: add dump() to MDSCacheObject

Subclasses extend this with their own attributes.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: add SimpleLock::dump
John Spray [Wed, 18 Mar 2015 10:39:10 +0000 (10:39 +0000)]
mds: add SimpleLock::dump

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: add a dump() method to MutationImpl
John Spray [Tue, 17 Mar 2015 18:36:13 +0000 (18:36 +0000)]
mds: add a dump() method to MutationImpl

This is just an externally callable wrapper
to _dump that doesn't require caller
to pass in a time.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoinclude/frag: add a dump() method to fragtree_t
John Spray [Tue, 17 Mar 2015 17:47:50 +0000 (17:47 +0000)]
include/frag: add a dump() method to fragtree_t

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: move auth_pins attrs into MDSCacheObject
John Spray [Thu, 26 Feb 2015 14:47:02 +0000 (14:47 +0000)]
mds: move auth_pins attrs into MDSCacheObject

These were common between CInode, CDir, CDentry.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge branch 'master' of github.com:ceph/ceph
Sage Weil [Thu, 19 Mar 2015 20:05:01 +0000 (13:05 -0700)]
Merge branch 'master' of github.com:ceph/ceph

10 years agoMerge remote-tracking branch 'gh/hammer'
Sage Weil [Thu, 19 Mar 2015 19:41:04 +0000 (12:41 -0700)]
Merge remote-tracking branch 'gh/hammer'

Conflicts:
PendingReleaseNotes
src/Makefile.am
src/gmock
src/test/Makefile.am

10 years agoMerge pull request #4035 from ceph/wip-11113
Josh Durgin [Thu, 19 Mar 2015 18:47:55 +0000 (11:47 -0700)]
Merge pull request #4035 from ceph/wip-11113

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3988 from ceph/wip-refine-build-configuration-hammer
Sage Weil [Thu, 19 Mar 2015 18:31:31 +0000 (11:31 -0700)]
Merge pull request #3988 from ceph/wip-refine-build-configuration-hammer

Refine build configuration for hammer

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4104 from rzarzynski/wip-11148
Yehuda Sadeh [Thu, 19 Mar 2015 16:57:30 +0000 (09:57 -0700)]
Merge pull request #4104 from rzarzynski/wip-11148

rgw: rectify 202 Accepted in response for PUT on already existing bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4105 from athanatos/wip-11110
Samuel Just [Thu, 19 Mar 2015 16:41:58 +0000 (09:41 -0700)]
Merge pull request #4105 from athanatos/wip-11110

Wip 11110

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoinit-radosgw*: don't require rgw_socket_path to be defined
Yehuda Sadeh [Thu, 19 Mar 2015 03:55:24 +0000 (20:55 -0700)]
init-radosgw*: don't require rgw_socket_path to be defined

Fixes: #11159
Backport: hammer, firefly

Scripts required rgw_socket_path to exist in order to start radosgw.
This is not needed.

Reported-by: Dan Mick <dmick@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 6823bcdcd0ce72cd223e809291f46d82da76115c)

10 years agoMerge pull request #4087 from ceph/wip-11159
Sage Weil [Thu, 19 Mar 2015 16:12:17 +0000 (09:12 -0700)]
Merge pull request #4087 from ceph/wip-11159

init-radosgw*: don't require rgw_socket_path to be defined

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4064 from dachary/wip-10488-jerasure-idempotent
Samuel Just [Thu, 19 Mar 2015 15:52:53 +0000 (08:52 -0700)]
Merge pull request #4064 from dachary/wip-10488-jerasure-idempotent

mon: informative message when erasure-code-profile set fails

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4066 from dachary/wip-11144-erasure-code-profile-rm
Samuel Just [Thu, 19 Mar 2015 15:52:45 +0000 (08:52 -0700)]
Merge pull request #4066 from dachary/wip-11144-erasure-code-profile-rm

osd: erasure-code-profile incremental rm before set

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoPG: ensure that info.last_epoch_started only increases 4105/head
Samuel Just [Wed, 18 Mar 2015 19:11:07 +0000 (12:11 -0700)]
PG: ensure that info.last_epoch_started only increases

See doc/dev/osd_internals/last_epoch_started.rst

Fixes: #11110
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agodoc: add last_epoch_started.rst
Samuel Just [Wed, 18 Mar 2015 19:02:04 +0000 (12:02 -0700)]
doc: add last_epoch_started.rst

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4054 from diurchenko/wip-10662
Yehuda Sadeh [Thu, 19 Mar 2015 14:41:10 +0000 (07:41 -0700)]
Merge pull request #4054 from diurchenko/wip-10662

rgw: Swift API. Allows setting attributes with COPY object operation.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: rectify 202 Accepted in response for PUT on existing bucket. 4104/head
Radoslaw Zarzynski [Thu, 19 Mar 2015 13:52:18 +0000 (14:52 +0100)]
rgw: rectify 202 Accepted in response for PUT on existing bucket.

Fixes: #11148
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
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 agoinit-radosgw*: don't require rgw_socket_path to be defined 4087/head
Yehuda Sadeh [Thu, 19 Mar 2015 03:55:24 +0000 (20:55 -0700)]
init-radosgw*: don't require rgw_socket_path to be defined

Fixes: #11159
Backport: hammer, firefly

Scripts required rgw_socket_path to exist in order to start radosgw.
This is not needed.

Reported-by: Dan Mick <dmick@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: don't use rgw_socket_path if frontend is configured 4085/head
Yehuda Sadeh [Thu, 19 Mar 2015 03:49:13 +0000 (20:49 -0700)]
rgw: don't use rgw_socket_path if frontend is configured

Fixes: #11160
Backport: hammer, firefly

Previously if we wanted to use the tcp fcgi socket, we needed to clear
rgw_socket_path.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
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 #3898 from jdurgin/wip-rbd-merge-diff
Sage Weil [Wed, 18 Mar 2015 20:18:18 +0000 (13:18 -0700)]
Merge pull request #3898 from jdurgin/wip-rbd-merge-diff

qa: make rbd-fuse exit cleanly with lttng

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4071 from athanatos/wip-10718
Sage Weil [Wed, 18 Mar 2015 20:16:53 +0000 (13:16 -0700)]
Merge pull request #4071 from athanatos/wip-10718

Wip 10718

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4016 from ceph/wip-11123
Samuel Just [Wed, 18 Mar 2015 19:18:16 +0000 (12:18 -0700)]
Merge pull request #4016 from ceph/wip-11123

osd: fix whiteout handling for delete+create compound ops

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoPG: make sure to update history.last_epoch_started with first write
Samuel Just [Wed, 18 Mar 2015 18:19:09 +0000 (11:19 -0700)]
PG: make sure to update history.last_epoch_started with first write

Otherwise, we might remember the write, but not that the activation
interval was history.last_epoch_started.

Signed-off-by: Samuel Just <sjust@redhat.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>