Commit Graph

45545 Commits

Author SHA1 Message Date
Josh Durgin
3ab1668c6a Merge pull request #6525 from dillaman/wip-13636-jewel
WorkQueue: new PointerWQ base class for ContextWQ

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-10 21:43:52 -08:00
Jason Dillaman
3e78b18b09 WorkQueue: new PointerWQ base class for ContextWQ
The existing work queues do not properly function if added to a running
thread pool.  librbd uses a singleton thread pool which requires
dynamically adding/removing work queues as images are opened and closed.

Fixes: #13636
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-10 11:31:33 -05:00
Josh Durgin
de95d204bd Merge pull request #6508 from dillaman/wip-13726
librbd: deadlock while attempting to flush AIO requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-09 23:28:46 -08:00
Jason Dillaman
bfeb90e5fe librbd: fixed deadlock while attempting to flush AIO requests
In-flight AIO requests might force a flush if a snapshot was created
out-of-band.  The flush completion was previously invoked asynchronously,
potentially via the same thread worker handling the AIO request. This
resulted in the flush operation deadlocking since it can't complete.

Fixes: #13726
Backport: infernalis, hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-09 11:22:24 -05:00
Jason Dillaman
a9729d9553 tests: new test case to catch deadlock on RBD image refresh
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-09 10:48:10 -05:00
Yehuda Sadeh
a030e56469 Merge pull request #5938 from zhuangzeqiang/rgw-cerr
rgw:  clarify the error message when trying to create an existed user

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-06 13:48:43 -08:00
Sage Weil
24380c8ea3 Merge pull request #6479 from ceph/wip-systemd-rbdmap
rbdmap: systemd support

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-06 16:24:26 -05:00
Jason Dillaman
b55a41b579 Merge pull request #6467 from fullerdj/wip-13697
cls_rbd: change object_map_update to return 0 on success, add logging

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-11-06 14:39:58 -05:00
Yehuda Sadeh
bbd5584b22 Merge pull request #6059 from dwj192/dwj-master-tip
rgw:mdlog trim add usage prompt

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-06 11:33:40 -08:00
Yehuda Sadeh
c601a807e0 Merge pull request #6408 from dwj192/swift-civetweb-ssl
rgw:swift use Civetweb ssl can not get right url

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-06 11:00:51 -08:00
Douglas Fuller
26befe1512 cls_rbd: change object_map_update to return 0 on success, add logging
The rbd_object_map_update class method returns the size of the data read
from the object map when no update is necessary. Change this to return 0
on success. Add error logging to differentiate error cases.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
2015-11-06 08:37:48 -08:00
Kefu Chai
01b6f662b9 Merge pull request #6483 from ceph/wip-fix-doc-build
doc/releases-notes: fix build error

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-06 20:54:21 +08:00
Kefu Chai
f33282eb22 doc/releases-notes: fix build error
also change the release year of infernalis from 2014 to 2015

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-11-06 20:52:22 +08:00
Boris Ranto
9224ac2ad2 rbdmap: systemd support
Fixes: #13374
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-11-06 10:26:22 +01:00
Kefu Chai
051a52e55f Merge pull request #6476 from xiexingguo/xxg-wip-13703
librados: wrongly passed in argument for stat command

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-06 16:35:51 +08:00
Jason Dillaman
2c968db0f2 Merge pull request #5645 from xinxinsh/wip-snap-rename
implement snapshot rename

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-11-05 16:09:40 -05:00
Boris Ranto
c0980af3c7 rbdmap: Move do_map and do_unmap shell functions to rbdmap script
This patch creates rbdmap shell script that is called from init-rbdmap
init script. The patch also renames src/rbdmap configuration file to
src/etc-rbdmap so that rbdmap shell script can be installed via build
system directly. Finally, the patch accomodates these changes in spec
file and build system.

Fixes: #13374
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-11-05 21:04:50 +01:00
Jason Dillaman
c17a75a7e6 Merge pull request #5856 from runsisi/wip-misc-remove-dup-test
librbd: remove duplicate read_only test in librbd::async_flatten

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-11-05 12:25:49 -05:00
Jason Dillaman
72a9fb425f Merge pull request #6339 from xinxinsh/wip-13558
librbd : fix enable objectmap feature issue

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-11-05 10:34:53 -05:00
xiexingguo
508bd8771d librados: wrongly passed in argument for stat command
The first argument of io_ctx_impl->stat() requires an obj(of type object_t), but an oid(of type string) is directly passed in instead.
Fixes: #13703
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-11-05 22:59:00 +08:00
Kefu Chai
01e0a75890 Merge pull request #6445 from ceph/wip-init-rbdmap
Init rbdmap patchset.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-05 21:41:09 +08:00
Loic Dachary
920fc85e31 Merge pull request #6468 from cxwshawn/wip-mail-fix
modify member info in mailmap 

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-05 07:35:56 +01:00
Xiaowei Chen
c228bd2ddb [mailmap] add member info.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
2015-11-04 20:54:56 -05:00
Sage Weil
3eccde9d9c Merge tag 'v9.2.0'
v9.2.0
2015-11-04 19:40:17 -05:00
xinxin shu
b0536ebab4 librbd : fix enable objectmap feature issue
Fixes: #13558

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
2015-11-05 08:38:56 +08:00
Sage Weil
2ac35be431 doc/release-notes: edits from Nathan Cutler
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-04 16:37:53 -05:00
Sage Weil
6e87d23301 doc/release-notes: final infernalis notes
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-04 16:37:53 -05:00
Jason Dillaman
0d299c9566 Merge pull request #6334 from xinxinsh/wip-13533
rbd : fix clone isssue

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-11-04 14:39:43 -05:00
Yehuda Sadeh
c08344fb48 Merge pull request #6465 from oritwas/wip-13596
radosgw-admin: metadata list user should return an empty list when user pool is empty

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-04 10:40:19 -08:00
Orit Wasserman
78c5b9a2d1 radosgw-admin: metadata list user should return an empty list when pool is empty
Fixes: #13596

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-11-04 18:57:22 +01:00
Loic Dachary
e2a5ebb105 Merge pull request #6340 from joaquimrocha/rados_write_benchmark_new_options
Rados write benchmark new options

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-04 18:22:26 +01:00
Joaquim Rocha
da6825d499 test/test_rados_tool.sh: Add tests for the new bench's write options
Those are the combinations of --write-omap, --write-xattr and --write-object.

Signed-off-by: Joaquim Rocha <joaquim.rocha@cern.ch>
2015-11-04 13:57:42 +01:00
Joaquim Rocha
9259e6e0c9 tools/rados/rados.cc: Add options to choose the benchmark's write destination
Signed-off-by: Joaquim Rocha <joaquim.rocha@cern.ch>
2015-11-04 13:57:42 +01:00
Joaquim Rocha
7524e16f45 tools/rados/rados.cc: Write to different destinations
The write benchmark only writes the objects' contents, not the omap
nor the extended attributes, which is something also interesting to
measure depending on the cluster's configuration.

These changes add a way to specify where the contents should be
written, allowing to combine any of the destinations mentioned above.

Signed-off-by: Joaquim Rocha <joaquim.rocha@cern.ch>
2015-11-04 13:57:42 +01:00
Yehuda Sadeh
3084406ac5 Merge pull request #6400 from ceph/wip-12997
rgw: Add default quota config

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-03 20:42:53 -08:00
Yehuda Sadeh
8fed45843f Merge pull request #5738 from dwj192/dwj192_bkt_index
rgw: fix objects can not be displayed which object name does not cont…

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-03 11:27:18 -08:00
Jenkins Build Slave User
bb2ecea240 9.2.0 2015-11-03 16:58:32 +00:00
Loic Dachary
76de0c39fe Merge pull request #6452 from dachary/wip-13664-test-ec
tests: test/librados/test.cc must create profile

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-11-03 08:22:36 +01:00
Loic Dachary
cab3d3f2f2 Merge pull request #6410 from Vicente-Cheng/ceph-disk-list-plain-single-failure
ceph-disk: get Nonetype when ceph-disk list with --format plain on single device.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-03 08:05:19 +01:00
xinxin shu
da48dbb8f8 rbd: fix clone issue when we specify image feature
Fixes: #13553

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
2015-11-03 14:00:00 +08:00
Loic Dachary
a60342942b tests: test/librados/test.cc must create profile
Now that the create_one_ec_pool function removes the testprofile each
time it is called, it must create the testprofile erasure code profile
again for the test to use.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-11-03 00:21:51 +01:00
Loic Dachary
7f8bf7a2c2 Merge pull request #6446 from dachary/wip-13664-test-ec
tests: destroy testprofile before creating one

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-11-02 23:12:31 +01:00
Loic Dachary
47abab9a6f tests: destroy testprofile before creating one
The testprofile erasure code profile is destroyed before creating a new
one so that it does not fail when another testprofile erasure code
profile already exists with different parameters.

This must be done when creating erasure coded pools with the C++
interface, in the same way it's done with the C interface.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-11-02 20:32:15 +01:00
Loic Dachary
ab46d79bc0 tests: add destroy_ec_profile{,_pp} helpers
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-11-02 20:32:11 +01:00
Samuel Just
f66e576ec5 Merge pull request #6444 from liewegas/wip-pg-key
osd/PG: tolerate missing epoch key

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-11-02 08:17:19 -08:00
David Zafman
efe165e3ac Merge pull request #6406 from xiexingguo/xxg-wip-13626
FileJournal:_fdump wrongly returns if journal is currently unreadable.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
2015-11-02 08:14:37 -08:00
Boris Ranto
629c41f904 ceph.spec.in: We no longer need redhat-lsb-core
Drop the redhat-lsb-core dependency as it is no longer necessary on
fedora/rhel.

The other two init scripts do not use redhat-lsb-core either. The
init-ceph.in conditionally requires /lib/lsb/init-functions and does not
use any of the functions defined in that file (at least not directly).
The init-radosgw file includes /etc/rc.d/init.d/functions on non-debian
platforms instead of /lib/lsb/init-functions file so it does not require
redhat-lsb-core either.

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-11-02 17:04:28 +01:00
Boris Ranto
e382c677f3 init-rbdmap: Rewrite to use logger + clean-up
This patch rewrites the init-rbdmap init script so that it uses logger
instead of the log_* functions. The patch also fixes various smaller
bugs like:
* MAP_RV was undefined if mapping already existed
* UMNT_RV and UMAP_RV were almost always empty (if they succeeded) ->
  removed them
* use of continue instead RET_OP in various places (RET_OP was not being
  checked after the switch to logger messages)
* removed use of DESC (used only twice and only one occurrence actually
  made sense)

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-11-02 17:04:28 +01:00
Sage Weil
b9ac90d0a8 osd/PG: tolerate missing epoch key
An orphan PG may have an info attr but no epoch key.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-02 08:32:06 -05:00
Kefu Chai
ee029ebf90 Merge pull request #5133 from stiopaa1/ThreadMoveCopyConstr
Thread.h: disable copy constructor and assignment op

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-02 21:24:44 +08:00