Commit Graph

40237 Commits

Author SHA1 Message Date
Jianpeng Ma
537e88ec7d qa/cephtool: Using add-cache rather than add to test ceph health.
Don't forget set cachemode.
By the way, For test max_target_bytes, don't reply on /etc/passwd
because different host have different size of /etc/passwd.
Avoid met this bug, i create a tmp file.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-03-20 09:55:39 +08:00
Jianpeng Ma
def4fc4ae5 osdc: add epoch_t last_force_resend in Op/LingerOp.
Using this field record the pg_poo_t::last_force_op_resend to avoid op
endless when osd reply with redirect.

Fixes: #11026
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-20 09:37:48 +08:00
Sage Weil
b509bc7931 doc/release-notes: more hammer release notes
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-19 17:24:33 -07:00
Sage Weil
c56773021c 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>
2015-03-19 17:19:59 -07:00
Sage Weil
bf814d5248 doc/release-notes: make hammer note about filestore format upgrade
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-19 17:16:15 -07:00
John Spray
8af2b43263 Merge pull request #3885 from Ved-vampir/master
common: add perf counters description

Reviewed-by: John Spray <john.spray@redhat.com>
2015-03-19 22:05:31 +00:00
John Spray
3ee11b567c 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>
2015-03-19 22:03:04 +00:00
John Spray
67fdb1c16c Merge pull request #3750 from ceph/wip-dump-cache
mds: Add 'dump cache' asok

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-19 22:00:48 +00:00
John Spray
936e003c95 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>
2015-03-19 21:27:35 +00:00
John Spray
abb4a73ac9 mds: use MDSCacheObject::dump in CDir::dump
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-19 21:27:34 +00:00
John Spray
107e7c9712 mds: add CDentry::dump
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-19 21:27:34 +00:00
John Spray
a33d1694d9 mds: extended dump() for CInode
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-19 21:27:34 +00:00
John Spray
9184e1ddad mds: add dump() to MDSCacheObject
Subclasses extend this with their own attributes.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-19 21:27:34 +00:00
John Spray
5ca0095bb2 mds: add SimpleLock::dump
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-19 21:27:34 +00:00
John Spray
75ff9d6926 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>
2015-03-19 21:27:34 +00:00
John Spray
842a4c32d3 include/frag: add a dump() method to fragtree_t
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-19 21:27:34 +00:00
John Spray
62ee84eb36 mds: move auth_pins attrs into MDSCacheObject
These were common between CInode, CDir, CDentry.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-19 21:27:32 +00:00
Sage Weil
bc7f6ced69 Merge branch 'master' of github.com:ceph/ceph 2015-03-19 13:05:01 -07:00
Sage Weil
d26a9dce5e Merge remote-tracking branch 'gh/hammer'
Conflicts:
	PendingReleaseNotes
	src/Makefile.am
	src/gmock
	src/test/Makefile.am
2015-03-19 12:41:04 -07:00
Josh Durgin
634c5a9443 Merge pull request #4035 from ceph/wip-11113
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-19 11:47:55 -07:00
Sage Weil
cfecd125fe Merge pull request #3988 from ceph/wip-refine-build-configuration-hammer
Refine build configuration for hammer

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-19 11:31:31 -07:00
Yehuda Sadeh
43ee14342f 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>
2015-03-19 09:57:30 -07:00
Samuel Just
91a5816702 Merge pull request #4105 from athanatos/wip-11110
Wip 11110

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-19 09:41:58 -07:00
Yehuda Sadeh
f96d58bd88 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 6823bcdcd0)
2015-03-19 09:18:25 -07:00
Sage Weil
e361066f78 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>
2015-03-19 09:12:17 -07:00
Samuel Just
b8fa08c692 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>
2015-03-19 08:52:53 -07:00
Samuel Just
3d22b88e49 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>
2015-03-19 08:52:45 -07:00
Samuel Just
0712d8d90b 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>
2015-03-19 08:41:40 -07:00
Samuel Just
2956ae278d doc: add last_epoch_started.rst
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-19 08:41:38 -07:00
Yehuda Sadeh
6c5fe91e2c 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>
2015-03-19 07:41:10 -07:00
Radoslaw Zarzynski
3998fe7e02 rgw: rectify 202 Accepted in response for PUT on existing bucket.
Fixes: #11148
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2015-03-19 14:59:50 +01:00
Loic Dachary
fe25118b73 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>
2015-03-19 11:16:43 +01:00
Danny Al-Gaaf
cca067efde 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>
2015-03-19 09:38:46 +01:00
Yehuda Sadeh
6823bcdcd0 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>
2015-03-18 20:55:24 -07:00
Yehuda Sadeh
36d6eea3ca 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>
2015-03-18 20:52:56 -07:00
Gregory Farnum
68d3637fea Merge pull request #3951 from ceph/wip-cephfs-snaps
Wip cephfs snaps

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-18 14:31:51 -07:00
Josh Durgin
700a2ea400 Merge pull request #4072 from javierguerragiraldez/master
rados.py: fix Object.write() method

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-18 13:53:07 -07:00
Javier Guerra
d5d0aa332a 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>
2015-03-18 15:22:28 -05:00
Sage Weil
78790b304b 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>
2015-03-18 13:18:18 -07:00
Sage Weil
e096593a02 Merge pull request #4071 from athanatos/wip-10718
Wip 10718

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-18 13:16:53 -07:00
Samuel Just
cce74c7858 Merge pull request #4016 from ceph/wip-11123
osd: fix whiteout handling for delete+create compound ops

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-03-18 12:18:16 -07:00
Samuel Just
2da958464d 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>
2015-03-18 11:19:49 -07:00
Haomai Wang
9ad1b283dc Merge pull request #4067 from ceph/wip-rbd-warning
tests: remove unused variable

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-19 00:44:48 +08:00
Josh Durgin
e54d57df15 tests: remove unused variable
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-03-18 09:18:24 -07:00
Loic Dachary
0d52aca0d0 osd: erasure-code-profile incremental rm before set
It is possible for an incremental change to have both a rm and a set for
a given erasure code profile. It only happens when a rm is followed by a
set. When a set is followed by a rm, the rm will remove the pending set
in the incremental change.

The logic is the same for pool create and pool delete.

We must apply the incremental erasure-code-profile removal before the
creation otherwise rm and set in the same proposal will ignore the set.

This fix is minimal. A better change would be that erasure-code-profile
set checks if there is a pending removal and wait_for_finished_proposal
before creating.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-18 14:17:00 +01:00
Loic Dachary
b92f9cf73e mon: informative message when erasure-code-profile set fails
When erasure-code-profile set refuses to override an existing profile,
it may be non trivial to figure out why. For instance:

   ceph osd set default ruleset-failure-domain=host

fails with:

   Error EPERM: will not override erasure code profile default

although ruleset-failure-domain=host is documented to be the
default. The error message now includes the two profiles that have been
compared to not be equal so that the user can verify the difference.

   Error EPERM: will not override erasure code profile default
   because the existing profile
   {directory=.libs,k=2,m=1,plugin=jerasure,technique=reed_sol_van}
   is different from the proposed profile
   {directory=.libs,k=2,m=1,plugin=jerasure,ruleset-failure-domain=host,technique=reed_sol_van}

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-18 11:53:20 +01:00
Yan, Zheng
2395ee1b24 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>
2015-03-18 14:25:44 +08:00
Yan, Zheng
0dfab5d639 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>
2015-03-18 14:25:44 +08:00
Yan, Zheng
1956e68231 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>
2015-03-18 14:25:44 +08:00
Yan, Zheng
1bb4a9df60 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>
2015-03-18 14:25:44 +08:00