Commit Graph

42473 Commits

Author SHA1 Message Date
Kefu Chai
6df56f252b Merge pull request #4928 from xiaoxichen/wip-cleanup-key
os/{LevelDB,Rocks}Store: don't keep key_list in transaction

Reviewed-by: Sage Weil <sage@redhat.com>
2015-07-01 22:41:03 +08:00
Kefu Chai
725b6097d0 Merge pull request #5113 from tchaikov/wip-11840-reject-multiple-tiering
mon: disallow adding a tier on top of another tier

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-01 20:57:47 +08:00
Kefu Chai
5c3d074051 mon: disallow adding a tier on top of another tier
multiple tiering is not supported at the moment

Fixes: #11840
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-01 19:27:37 +08:00
Gregory Farnum
f32c00d860 Merge pull request #5112 from tchaikov/wip-12120
fix a couple build warnings

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-01 12:08:11 +01:00
Kefu Chai
e819a3c734 client: return EINVAL if iovcnt < 0 for p{read,write}v()
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-01 17:13:05 +08:00
Kefu Chai
19a75f1bd5 tools: fix deprecated warning
s/set_op_flags/set_op_flags2/

Fixes: #12120
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-01 17:12:58 +08:00
Sage Weil
5f8ecf2247 crush/CrushTester: fix signed/unsigned warning
Fixes: #12120
Signed-off-by: Sage Weil <sage@redhat.com>
2015-07-01 17:12:51 +08:00
Sage Weil
373e065037 client: fix signed/unsigned warnings in preadv code
Fixes: #12120
Signed-off-by: Sage Weil <sage@redhat.com>
2015-07-01 17:12:25 +08:00
Haomai Wang
1102c54768 Merge pull request #5107 from yuyuyu101/wip-fix-async-14
AsyncConnection: Move sign_message to write_message
2015-07-01 14:56:04 +08:00
Yan, Zheng
fb28226a75 Merge pull request #5070 from ceph/wip-4161
mds: store layout on header object
2015-07-01 09:00:11 +08:00
Haomai Wang
67fa726061 AsyncConnection: Move sign_message to write_message
sign_message require correct connection feature which may wrong when preparing
message

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-07-01 00:58:34 +08:00
Loic Dachary
59023a5390 Merge pull request #5105 from Oxygen31/master
doc : missing link in "quick_guide.rst"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-30 17:25:09 +02:00
unknown
504a48a3d3 doc : missing link in "quick_guide.rst"
Fixes: #12009

Signed-off-by: Germain CHIPAUX <germain.chipaux@gmail.com>
Signed-off-by: Thomas LAUMONDAIS <thomas.laumondais@gmail.com>
Signed-off-by: Pierre CHAUMONT <pierre.chaumont31@gmail.com>
Signed-off-by: Benjamin TROQUEREAU <benjamin.troquereau@gmail.com>
Signed-off-by: Benjamin SESIA <benjamin.sesia@gmail.com>
2015-06-30 15:58:17 +02:00
Kefu Chai
5f20add5c0 Merge pull request #5084 from JevonQ/fix-issue-12123
tests: fix segfault issue in preadv/pwritev tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-30 17:22:12 +08:00
Jevon Qiao
5614ec6cf5 tests: fix segfault issue in preadv/pwritev tests
Previously copied the sample data to the iov buffers not yet allocated.
Now allocate buffers before writing data into them.

Fixes: #12123
Signed-off-by: Jevon Qiao <qiaojianfeng@unitedstack.com>
2015-06-30 10:07:11 +08:00
Ken Dreyer
69a22b2920 Merge pull request #5094 from SUSE/wip-sharutils-dupe
ceph.spec.in: remove duplicate BuildRequires: sharutils

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-06-29 13:27:28 -06:00
branto1
0537cf241c Merge pull request #5082 from ceph/wip-fedora-babeltrace
ceph.spec.in: fix babeltrace handling on Fedora

Reviewed-by: Ira Cooper ira@samba.org
Reviewed-by: Boris Ranto branto@redhat.com
2015-06-29 16:01:33 +02:00
Loic Dachary
90b2ccabc0 Merge pull request #5098 from PierreChaumont/master
doc: homogenize Librados (Python) documentation's code samples

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-28 13:36:37 +02:00
PierreChaumont
8a221c3509 doc: homogenize Librados (Python) documentation's code samples
I put in doc/rados/api/python.rst line numbers on every code samples in
order to make them look all the same.

Fixes: #12174

Signed off: Pierre Chaumont pierre.chaumont31@gmail.com
2015-06-27 16:00:35 +02:00
Nathan Cutler
c418bd9615 ceph.spec.in: remove duplicate BuildRequires: sharutils
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-06-26 20:21:59 +02:00
Ken Dreyer
6dfba7678e Merge pull request #4957 from SUSE/wip-python-flask
ceph.spec.in: fix python-flask dependency for SUSE

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-06-26 12:20:33 -06:00
Nathan Cutler
39c28b9faf ceph.spec.in: fix python-flask dependency for SUSE
In SLE and openSUSE, the package is called python-Flask with an upper-case F.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-06-26 20:12:45 +02:00
Ken Dreyer
909301917e Merge pull request #5086 from SUSE/wip-12173
logrotate.conf: fixes for systemd

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-06-26 11:49:59 -06:00
Nathan Cutler
05424a803b logrotate.conf: fixes for systemd
Before this patch, the command 'logrotate -f /etc/logrotate.d/ceph'
was generating an error "Failed to reload ceph.target: Job type reload is not
applicable for unit ceph.target".

Before we issue systemctl reload, check that there is at least
one active ceph-* service. (The hyphen is significant.)

Since we use grep, make the grep package a dependency.

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

Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Lars Marowsky-Bree <lmb@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-06-26 19:43:44 +02:00
Yehuda Sadeh
04a69faff2 Merge pull request #5091 from yehudasa/wip-multipart-parts-limit
rgw: Multipart Upload: Support to configure and enforce no of parts a…

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-06-26 09:40:28 -07:00
Abhishek Dixit
876fbc64ba rgw: Multipart Upload: Support to configure and enforce no of parts allowed
Fixes: #12146
Config parameter added for no of parts limit in multipart upload and checked while
completing multipart upload

Signed-off-by: Abhishek Dixit <dixitabhi@gmail.com>
2015-06-26 09:38:31 -07:00
Ken Dreyer
e579e12c5b Merge pull request #4970 from SUSE/wip-12034-master
ceph.spec.in: python-argparse only in Python 2.6

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-06-26 10:06:15 -06:00
Nathan Cutler
23171c9529 ceph.spec.in: python-argparse only in Python 2.6
argparse is a widely-used Python module for parsing command-line arguments.
Ceph makes heavy use of Python scripts, both in the build environment and on
cluster nodes and clients.

Until Python 2.6, argparse was distributed separately from Python proper.
As of 2.7 it is part of the Python standard library.

Although the python package in a given distro may or may not Provide:
python-argparse, this cannot be relied upon.

Therefore, this commit puts appropriate conditionals around Requires:
python-argparse and BuildRequires: python-argparse. It does so for Red
Hat/CentOS and SUSE only, because the last Fedora version with Python 2.6
was Fedora 13, which is EOL.

argparse is required by both the ceph and ceph-common packages, but since ceph
requires ceph-common, the argparse Requires and BuildRequires need only appear
once, under ceph-common.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-06-26 12:46:46 +02:00
Haomai Wang
891f3e0e08 Merge pull request #5035 from yuyuyu101/wip-async-fix-13
AsyncConnection: Fix out-of-sequence problem introduced by send/write separated logic
2015-06-26 18:01:18 +08:00
Yan, Zheng
d91b9d1949 Merge pull request #5001 from ceph/wip-11985
#11985 Fixes to MDLog (and MDS) shutdown
2015-06-26 09:18:14 +08:00
Ken Dreyer
39b47f9f6f Merge pull request #5077 from SUSE/wip-spec-comment-clarify
ceph.spec.in: clarify two important comments
2015-06-25 13:28:48 -06:00
Nathan Cutler
dd212fd1d3 ceph.spec.in: clarify two important comments
First, the terms "common" and "specific" are vague. Second,
"common" can easily be confused with the ceph-common subpackage.

Fix this by rephrasing to "distro-unconditional dependencies" and
"distro-conditional dependencies", respectively.

Third, move the "distro-unconditional dependencies" header so it
is above the part where these dependencies are actually defined.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-06-25 19:55:12 +02:00
Yehuda Sadeh
83539c07fe Merge pull request #5033 from wuxingyi/fixuserquota
rgw: fix empty json response when getting user quota

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-06-25 10:30:43 -07:00
Ken Dreyer
c0ace46cc2 Merge pull request #4942 from SUSE/wip-11991
rpm: add missing Java conditionals

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-06-25 10:47:21 -06:00
John Spray
39cf071185 mds: fix MDLog shutdown process
We must join threads before completing ::shutdown,
because otherwise these threads might try to use
torn-down resources like the objecter.

The replay/recovery threads may be blocking on
journaler calls like wait_for_readable, so we
must signal them using Journaler::shutdown.  In
order for that to be safe, we must also protect
the assignment of ::journaler from the threads
using the mds_lock.

Fixes: #11985
Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-25 16:19:25 +01:00
John Spray
f2daa19c8d mds: drop MDSIOContext on mds->stopping
`stopping` is true once the MDS has entered suicide().  During
this phase, any MDSIOContexts that are called (e.g. from objecter,
journaler) become no-ops.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-25 16:19:24 +01:00
John Spray
ae387b6577 mds: refine shutdown, add ::stopping
Add a ::stopping flag, set at start of suicide(),
that other contexts must inspect after taking
mds_lock.

This guards against the possibility of multiple
threads entering suicide, and more generally
against the possibility of other procedures
starting while we're in the middle of shutting down.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-25 16:19:24 +01:00
John Spray
8072b19d37 osdc/Journaler: add a shutdown() method
Because consumers may be blocked on the on_readable
condition, it is necessary for Journaler to have
an explicit shutdown method that fires the completion

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-25 16:19:24 +01:00
John Spray
fe23c6c5e6 common/Thread: print msg on join errors
Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-25 16:19:24 +01:00
John Spray
95796a3db9 mds: add a ceph_file_layout wrapper for dencoder
So that we can decode it from tests.  This should go away
at some point when encoding of these raw-encoded structures
is modernized.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-25 14:47:13 +01:00
John Spray
c097881856 test/ceph-dencoder: add boilerplate
... mainly just for the modelines.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-25 14:47:13 +01:00
John Spray
8d9c95fa42 mds: store layout on header object
This is surprisingly simple because we were already redundantly
calling store_backtrace whenever the layout changed!  That was
a side effect of the way add_old_pool is handled, the backtrace
version is bumped to latest even if the "old" pool is the
current one.

The upshot is that if we accept the existing behaviour of
also unnecessarily updating the 'parent' xattr, keeping
the new 'layout' xattr update requires no new dirty flags.  This
is a twitchy enough behaviour that new tests are needed to guard
against regressions though.

Fixes: #4161
Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-25 14:47:13 +01:00
Kefu Chai
2ac566c823 Merge pull request #5058 from SUSE/wip-fix-release-notes-blooper
release-notes.txt: fix version number in section heading

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-25 20:54:37 +08:00
John Spray
3325f825ca Merge pull request #5073 from ceph/wip-12105
mds: update CInode::oldest_snap during migration

Reviewed-by: John Spray <john.spray@redhat.com>
2015-06-25 11:58:36 +01:00
Yan, Zheng
c9c655f6cb mds: update CInode::oldest_snap during migration
Fixes: #12105
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-06-25 16:38:36 +08:00
Yan, Zheng
b0dc97198a Merge pull request #5036 from ceph/wip-dirfrag-msgs
mds: tweak dirfrag asok messages
2015-06-25 14:56:48 +08:00
Ken Dreyer
f3e4a91c45 ceph.spec.in: rm reference to EOL Fedoras (< 20)
Fedora 19 is EOL, so there's no need to refer to Fedoras less than 20.
"%{fedora}" effectively implies "Fedora 20 and above".

Reported-by: Ira Cooper <ira@samba.org>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-06-24 16:43:53 -06:00
Ken Dreyer
2db9480fa2 ceph.spec.in: package rbd-replay-prep on all Fedoras
This reverts the change in commit
85517d611b. Since we BuildRequire:
libbabeltrace-devel, autoconf will see that babeltrace is available
during the build, and make will build/install the rbd-replay-prep
utility.

This change also simplifies Fedora selection logic, because Fedora 19 is
EOL, so "%{fedora}" implies "Fedora 20 and above".

Reported-by: Ira Cooper <ira@samba.org>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-06-24 16:43:30 -06:00
Ken Dreyer
b5e5778b20 Merge pull request #4981 from ceph/wip-fedora-build-fixes
Fix various issues with fedora (f21+) builds

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-06-24 14:04:16 -06:00
Ken Dreyer
075fb9f9e0 Merge pull request #4898 from SUSE/wip_ceph_spec_sharutils
ceph.spec.in:BuildRequires sharutils

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
2015-06-24 11:30:13 -06:00