Commit Graph

39983 Commits

Author SHA1 Message Date
Ilya Dryomov
6d9fbbe6f9 rbd: fix rw option skipping logic
We slip in an extraneous comma if { "rw": "rw" } happens to be the
first map_options pair:

    # ./rbd map -o rw,share foo
    /dev/rbd0

    -> 127.0.0.1:6789 name=admin,key=client.admin,,share rbd foo -

The kernel mount options parser can handle it, but fix it nonetheless.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-03-12 14:28:01 +03:00
Ilya Dryomov
2769da40d7 rbd: recognize cephx_require_signatures and tcp_nodelay options
Support for these went into 3.19 and 4.0 kernels respectively.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-03-12 14:27:32 +03:00
Ilya Dryomov
84adff4c74 rbd: add rbd default map options config option
Allow supplying rbd map -o / --options through 'rbd default map
options' config option.  Options specified on the command line take
precedence on a per-option basis, i.e. default and cli options are
merged with a preference for the latter.  For example:

    # grep 'rbd default map options' ceph.conf
            rbd default map options = "ro,nocrc"
    # ./rbd map -o noshare,rw foo
    /dev/rbd0

results in a rw mapping with nocrc,noshare.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-03-12 14:27:32 +03:00
Ilya Dryomov
cd761bb6d3 rbd: drop redefining map option warning
For example:

    # ./rbd map -o share,noshare foo
    rbd: warning: redefining map option share: 'share' -> 'noshare'
    /dev/rbd0

mount(8) doesn't do this and it's a bit silly to begin with.  Drop this
in preparation for adding rbd default map options config option.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-03-12 14:27:32 +03:00
Ilya Dryomov
356a749f63 rbd: regenerate rbd(8) man page
merge-diff and status commands, --image-features and --image-shared
options, other stuff.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-03-12 14:27:32 +03:00
Yan, Zheng
07f5d7d316 Merge pull request #3666 from xroche/master
Added ceph_flock() to libcephfs.
2015-03-11 20:30:26 +08:00
Kefu Chai
ea7a127250 Merge pull request #3920 from rajukv/xio-bugfix
XIO: Handle requeue case of XIO messages

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-11 14:37:57 +08:00
Raju Kurunkad
dbb8c93d41 XIO: Handle requeue case of XIO messages
If we are not able to send the XIO message using xio_send_msg(),
remove the XIO message from the send Q, before queuing it to the resend
Q. Otherwise, boost will generate a assert.

Signed-off-by: Raju Kurunkad <raju.kurunkad@sandisk.com>
2015-03-11 12:00:36 +05:30
Sage Weil
5d5b510810 doc/release-notes: v0.80.8 and .9 changelogs
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-10 12:32:47 -07:00
Ken Dreyer
51f5feccac Merge pull request #3871 from dachary/wip-install-deps
tests: install-deps.sh install EPEL and RHEL Optional

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-03-10 10:42:16 -06:00
Kefu Chai
d2057bd6d9 Merge pull request #3887 from stiopaa1/feature10891
mon: add "osd pool get $pool all" command

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-10 22:16:29 +08:00
Sage Weil
faa1f2741c Merge remote-tracking branch 'gh/hammer'
Conflicts:
	src/gmock
2015-03-10 06:24:59 -07:00
Loic Dachary
830a4a1b6b tests: install-deps.sh install EPEL and RHEL Optional
On CentOS and RHEL, some dependencies come from EPEL.

Always enable RHEL Optional repository for RHEL as packages such as
packages such as libatomic_ops-devel or libedit-devel are only found
there in RHEL 6.5.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-10 11:39:52 +01:00
Danny Al-Gaaf
b17c3ebbdc Merge pull request #3901 from dachary/wip-10922-ceph-deploy-documentation
doc: preparing a device implies activate

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-10 10:53:56 +01:00
Danny Al-Gaaf
01cee14271 Merge pull request #3907 from dachary/wip-test-delays
tests: increase the delay waiting for a cluster event

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-10 10:51:05 +01:00
Danny Al-Gaaf
15d97794d0 Merge pull request #3914 from ktdreyer/wip-doc-rgw-apache-log-perms
doc: rm Apache log permissions instructions

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-10 10:47:51 +01:00
Kefu Chai
9b4b350695 Merge pull request #3917 from dachary/wip-rhel6-doc
doc: rhel6.5 is rhel6

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-10 16:02:12 +08:00
Kefu Chai
23d2e5aade Merge pull request #3890 from XunleiGFS/fix_C_TwoContexts
osdc: fix a memory leak in C_TwoContexts

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-10 12:16:03 +08:00
Sage Weil
955bd114fc Merge pull request #3845 from ceph/wip-wn-rgw-hammer
Wip wn rgw hammer

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-09 19:49:21 -07:00
Sage Weil
5c73f1da25 Merge pull request #3913 from yuyuyu101/wip-async-fix-throttle-deadlock
Wip async fix throttle deadlock

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-09 19:48:11 -07:00
Sage Weil
05bb9c9870 Merge pull request #3911 from athanatos/wip-11057
ReplicatedPG: block write on degraded object if there are waiters

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-09 19:43:02 -07:00
Loic Dachary
e3616a5515 doc: rhel6.5 is rhel6
RHEL 6.5 is actually  http://ceph.com/rpm-giant/rhel6/

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-10 02:06:10 +01:00
Loic Dachary
b780048c48 Merge pull request #3909 from dachary/wip-11068-debian-jessie
deb: add zlib1g-dev to Build-Depends for Debian/jessie

Reviewed-by: Yann Dupont <yann@objoo.org>
2015-03-09 23:40:04 +01:00
Michal Jarzabek
ea6192116c mon/OSDMonitor: refactor and new key "all" for osd pool get command
This will only output all the values applicable to a given type of pool.
So for example for a pool that is not a tier pool values like HIT_SET_TYPE,
HIT_SET_PERIOD, HIT_SET_COUNT etc. will be ignored.

Fixes: #10891
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2015-03-09 19:44:26 +00:00
Ken Dreyer
9b5d79ee13 doc: rm Apache log permissions instructions
On all distros, Apache should be able to write to its own log directory.
If not, that is a severe distro bug that should be reported/fixed.

Remove the references to running "chown" on /var/log/httpd or
/var/log/apache2.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-03-09 13:12:25 -06:00
Sage Weil
a9c4edab1c doc/release-notes: update notes for v0.80.9
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-09 10:56:11 -07:00
Yehuda Sadeh
3b50da8332 Merge pull request #3608 from guangyy/wip-rgw-quota-threads
rgw: make quota/gc thread configurable for starting

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-09 09:39:58 -07:00
Yehuda Sadeh
a22a63d283 Merge pull request #3795 from rzarzynski/wip-10938
rgw: improve support for X-Timestamp header of Swift API

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-09 09:37:02 -07:00
Haomai Wang
76becb2c1e Event: Let external events ran without lock/unlock
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-10 00:26:22 +08:00
Haomai Wang
1c92cb639d AsyncConnection: Don't block process when throttle is full
If this connection is blocking on throttler and another worker thread
try to acquire this connection's lock, it will deadlock.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-10 00:20:24 +08:00
Gregory Farnum
ea7fbdbdf8 Merge pull request #3668 from ceph/wip-compact-container
Optimize memory usage of MDS

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-09 12:17:40 -04:00
Loic Dachary
cc0db22fff Merge pull request #3908 from gravitystorm/patch-2
fix typo

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-09 16:35:28 +01:00
Loic Dachary
147b1db43f deb: add zlib1g-dev to Build-Depends for Debian/jessie
The zlib1g-dev is installed indirectly for Ubuntu 12.04 or Ubuntu 14.04
but it is only suggested in Debian/jessie. Adding it to the
Build-depends is redundant and harmless for Ubuntu and resolves the
missing dependency for Debian.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-09 15:51:53 +01:00
Andy Allan
aaabd57205 doc: fix typo
Signed-off-by: Andy Allan <github@gravitystorm.co.uk>
2015-03-09 14:41:18 +00:00
Loic Dachary
387887893f Merge pull request #3882 from dachary/wip-install-deps-alternatives
install-deps.sh: strip | in the list of packages

Reviewed-by: Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-09 13:53:25 +01:00
Sage Weil
bb9133af17 Merge pull request #3897 from ceph/wip-11015
crush: fix compilation of strwa2 buckets (fixes 11015)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-09 05:41:21 -07:00
Sage Weil
023558bbfa Merge pull request #3899 from yuyuyu101/hammer-test
TestAsyncDriver: Fix typo in ceph_test_async_driver
2015-03-09 05:40:49 -07:00
Loic Dachary
e84bc508dc Merge pull request #3906 from dachary/wip-mailmap
mailmap: David Zhang affiliation

Reviewed-by: Zhi (David) Zhang <zhangz@yahoo-inc.com>
2015-03-09 13:28:17 +01:00
Loic Dachary
302b628611 tests: increase the delay waiting for a cluster event
In some cases the machine running tests may be slow enough that it takes
more than a minute for an OSD to come up. It only happens rarely and
changing the wait period from 60 seconds to 120 seconds. Is so slow
that it takes more than 2 minutes to bring an OSD up, chances are a lot
more will go wrong anyway.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-09 13:00:37 +01:00
Loic Dachary
2c7006f8b4 mailmap: Zhi (David) Zhang affiliation
And name normalization

Reviewed-by: Zhi (David) Zhang <zhangz@yahoo-inc.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-09 12:51:06 +01:00
Loic Dachary
c327fbb9c2 doc: preparing a device implies activate
http://tracker.ceph.com/issues/10922 Fixes: #10922

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-09 11:35:14 +01:00
Sage Weil
549a112c3d Merge pull request #3874 from ceph/wip-10828
objecter: fix linger cancel link bug 10828

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-08 21:04:19 -07:00
Loic Dachary
a19f92cfa6 Merge pull request #3900 from dachary/wip-recursive-submodules
autogen.sh: do not submodule --force if git does not support it
2015-03-07 18:30:55 +01:00
Loic Dachary
9748d45b61 autogen.sh: do not submodule --force if git does not support it
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-07 17:11:58 +01:00
Loic Dachary
39adebbdaa Merge pull request #3895 from dachary/wip-recursive-submodules
doc,tests: force checkout of submodules
2015-03-07 16:53:50 +01:00
Haomai Wang
84f05c0f39 TestAsyncDriver: Fix typo in ceph_test_async_driver
Fix: #11058
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-07 17:14:31 +08:00
Samuel Just
b6326a05ee ReplicatedPG: block write on degraded object if there are waiters
Suppose we have min_size of 2 and size of 3, foo exists only on the
primary.
- block op 1 on foo due to < min_size
- start recovery on foo for replicas 1 and 2
- complete push to replica 1 (2 copies now)
- allow op 2 on foo through since we have 2 copies
- complete recovery on foo, requeue op 1

Fixes: 11057
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-06 18:02:25 -08:00
Sage Weil
7acfdaccb1 crushtool: test compilation of a rule with straw2 buckets
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-06 17:47:03 -08:00
Sage Weil
61308cc473 crush: parse alg names that include a digit
The str_p("straw2") won't parse straw2, it seems because the digit is throwing
it off.  Use the existing name rule instead which is more robust.  Note that
not constraining the alg value here is better anyway because instead of a
'cannot parse' error that is hard to debug we instead get a 'unknown alg foo'
error when doing the semantic pass.

Fixes: #11015
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-06 17:43:11 -08:00
Loic Dachary
cb6813cc16 tests: add Debian jessie dockerfile
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-07 02:40:13 +01:00