Commit Graph

52890 Commits

Author SHA1 Message Date
Jason Dillaman
1ccdcb5b6c rbd: disk usage now includes all snapshots by default
Added a new "--from-snap" optional to restrict the calculation to
specific subsets of snapshots and the HEAD revision.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 15:58:05 -04:00
Josh Durgin
b3d766baac Merge pull request #8568 from ddiss/osd-librados-writesame
OSD and librados writesame support

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-04-28 14:57:02 -05:00
Josh Durgin
3684e7b45f Merge pull request #8791 from dillaman/wip-15574
librbd: parent image is closed twice if error encountered while opening

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-28 14:55:20 -05:00
Josh Durgin
2abe34cf81 Merge pull request #8790 from dillaman/wip-15630
rbd-mirror: interrupting image replay startup can cause crash

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-28 14:54:57 -05:00
Josh Durgin
dbe9b76443 Merge pull request #8785 from tchaikov/wip-librbd-bad-header
librbd: does not crash if image header is too short

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-28 14:54:30 -05:00
Jason Dillaman
7f903baec7 Merge pull request #8813 from trociny/fix-test-librbd-aio_write
test: librbd: aio write/discard completion should always return 0 on success

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:25:28 -05:00
Mykola Golub
da80029dd6 test: librbd: aio write/discard completion should always return 0 on success
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-04-28 20:33:19 +03:00
Jason Dillaman
db7aaff0f6 librbd: block RPC requests while updating features
Disabling the journal and object map require acquiring the exclusive
lock locally.  We don't want to start executing long-running ops
for this quick process.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:04 -04:00
Jason Dillaman
ed132a1eb1 librbd: return -ESHUTDOWN when a refresh is requested on a closed image
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:04 -04:00
Jason Dillaman
88e76cb3c9 librbd: synchronous block_writes should return possible error result
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:04 -04:00
Jason Dillaman
9cf6821bd9 librbd: refresh image before executing maint op
If a maint op is interrupted and restarted, it's possible that the
image will need to be refreshed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:04 -04:00
Jason Dillaman
5a4893b7a7 librbd: reduce log level when lock owner not detected
This can happen under normal operating conditions and the
lock request is automatically retried.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:04 -04:00
Jason Dillaman
1617328402 librbd: reduce log level for interrupted maint ops
Fixes: http://tracker.ceph.com/issues/15572
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:03 -04:00
Jason Dillaman
27c8608fc1 Merge pull request #8795 from runsisi/wip-fix-librbd-ut
cmake: add library cls_journal for target unittest_librbd

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 08:40:39 -05:00
Jason Dillaman
678a020026 Merge pull request #8796 from runsisi/wip-fix-invalidate
librbd: fix potential assertion during object map invalidation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 08:38:57 -05:00
Sage Weil
f00cc5a3c6 Merge pull request #8812 from liewegas/wip-dh-systemd
debian/control: dh_systemd_start is in the dh-systemd package

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-28 09:14:41 -04:00
Sage Weil
89154d1e01 debian/control: dh_systemd_start is in the dh-systemd package
Fixes: http://tracker.ceph.com/issues/15573
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-28 09:13:50 -04:00
Michal Jarzabek
37fdc2e649 log: remove unnecessary includes from header file
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-04-28 13:27:46 +01:00
Abhishek Lekshmanan
c877e618d1 rgw_admin: add option to list_orphans_jobs
First cut for an rgw-admin to list current jobs for orphan search, as of
now we simply read the omap vals from index object and print the job id
and pool name, there is a --extra-info flag which dumps the detailed
json output and the normal option which just lists all the objects

Fixes: http://tracker.ceph.com/issues/15442
Suggested-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
2016-04-28 11:08:08 +02:00
Abhishek Lekshmanan
da42c0e578 rgw/formatter:json types for orphan search
json formatter for RGWOrphanSearchStage, RGWOrphanSearchInfo &
RGWOrphanSearchState

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-04-28 11:08:08 +02:00
Abhishek Lekshmanan
547fe4f35d rgw_orphan: adding a method to list jobs
Adding a method in RGWOrphanStore to list jobs, which reads the omap
vals from index object and sets values in a map of job id and
RGWOrphanSearchState

Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
2016-04-28 11:08:08 +02:00
Willem Jan Withagen
629929a8cf FileStore.cc: Add extra info in omap_get_values.
- This is extra information to indicate what the route actually used.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-04-28 10:04:23 +02:00
Sage Weil
1eb435fcd6 Merge pull request #8700 from tchaikov/wip-systemd-deb
debian: package systemd targets

Reviewed-by: Javier M. Mellid <jmunhoz@igalia.com>
2016-04-27 23:15:52 -04:00
runsisi
7efb29416b cmake: add library cls_journal for target unittest_librbd
otherwise if we want to generate target unittest_librbd we need to
(re)generate cls_journal manually

Signed-off-by: runsisi <runsisi@zte.com.cn>
2016-04-28 10:22:07 +08:00
Kefu Chai
f950a0a7f5 debian: install systemd target files
* enable it using dh_systemd_enable
* start the target using dh_systemd_start
* move the dh_installinit, dh_systemd_enable, dh_systemd_start calls
  down, so they can identify the service files if they care about them.

Fixes: http://tracker.ceph.com/issues/15573
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-04-28 10:02:08 +08:00
runsisi
dd0eb719a5 librbd: fix potential assertion for object map invalidation
if update_flags fails we should not go any further, or the async request
will be removed from m_image_ctx.async_requests twice

Signed-off-by: runsisi <runsisi@zte.com.cn>
2016-04-28 09:05:33 +08:00
Casey Bodley
410d432d11 radosgw-admin: update usage for zone[group] modify
the help strings indicated that only --master could be changed

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-04-27 18:07:45 -04:00
Sage Weil
4cdf0aa7ed Merge pull request #8792 from cbodley/wip-defer-drop-privileges
common: fix value of CINIT_FLAG_DEFER_DROP_PRIVILEGES

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-27 17:13:03 -04:00
Casey Bodley
dfb897ad57 common: fix value of CINIT_FLAG_DEFER_DROP_PRIVILEGES
0x16 (binary 10110) was overlapping two other flags

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-04-27 16:56:29 -04:00
Jason Dillaman
105ef8a24a librbd: propagate any image refresh errors back to caller
Previously, the saved error code was only propagated when an image
flush was required.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-27 15:56:11 -04:00
Jason Dillaman
e91e7f8d9c librbd: avoid second close attempt of invalid parent image
Fixes: http://tracker.ceph.com/issues/15574
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-27 15:46:04 -04:00
Jason Dillaman
3a71052a5b rbd-mirror: interrupting image replay startup can cause crash
Properly shut down the journaler if a shut down has been requested
while start up is in-progress.

Fixes: http://tracker.ceph.com/issues/15630
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-27 15:22:59 -04:00
Javier M. Mellid
05373354e4 rgw: add AWS4 completion support for RGW_OP_SET_BUCKET_WEBSITE
Fixes: http://tracker.ceph.com/issues/15626

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
2016-04-27 20:28:08 +02:00
Boris Ranto
27b467bad5 Merge pull request #8714 from ceph/wip-14941
rpm: implement scriptlets for the post-split daemon packages

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2016-04-27 20:13:38 +02:00
Kefu Chai
7b52183add librbd: does not crash if image header is too short
if something goes wrong with the object, and returns a chunk shorter
than expected, don't panic

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-04-28 00:59:44 +08:00
Boris Ranto
14652f3216 rpm: Add rpm scripts for ceph-rbd-mirror
We are currently missing the systemd scripts for the new ceph-rbd-mirror
daemons. This patch introduces them.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-04-27 18:14:51 +02:00
Boris Ranto
73f4579867 rpm: Start all the targets in %post
We need to have the sub-targets active for the ceph.target to be able
to propagate its calls to the services. If the sub-target is inactive,
the main target won't propagate the stop/restart calls.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-04-27 18:00:12 +02:00
Nathan Cutler
644aba9270 rpm: implement scriptlets for the post-split daemon packages
This patch gives each of the ceph-{mds,mon,osd,radosgw} packages its own
%post, %preun, and %postun scriptlets dealing with the package's unit files.

The scriptlets of ceph-base are adapted to handle the ceph.target unit file
only.

The scriptlets of ceph-mon handle ceph-create-keys services in addition to ceph-mon.

The scriptlets of ceph-osd handle ceph-disk services in addition to ceph-osd.

Fixes: http://tracker.ceph.com/issues/14941
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Boris Ranto <branto@redhat.com>
2016-04-27 14:24:51 +02:00
Nathan Cutler
53b1a6799c systemd: enable all the ceph .target services by default
Some distros, like Fedora and openSUSE, have a policy that all services are
disabled by default.

This patch changes that default for the ceph.target and
ceph-{mds,mon,osd,radosgw}.target services.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Boris Ranto <branto@redhat.com>
2016-04-27 14:20:29 +02:00
Nathan Cutler
a7f5ad5f6f install-deps.sh: systemd-rpm-macros must be installed on SUSE
Otherwise the script breaks.

Fixes: http://tracker.ceph.com/issues/15627
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-04-27 11:13:06 +02:00
Vikhyat Umrao
cad38dca0c librados: modify Pipe::connect() to return the error code
Fixes: http://tracker.ceph.com/issues/15308

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
2016-04-27 14:05:18 +05:30
cy.l@inwinstack.com
a7312a90b6 Fix RBD-NBD aio_callback error handling
Tracker-Id: #15604

Signed-off-by: Chang-Yi Lee <cy.l@inwinstack.com>
2016-04-27 11:11:29 +08:00
Tamil Muthamizhan
cafe8825ec Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
removed ceph-deploy folder, as its been already replaced with ceph-tests.
2016-04-26 16:13:28 -07:00
Casey Bodley
97fad75456 radosgw-admin: add missing --zonegroup-id to usage
also clarified that --rgw-zone takes the zone by name

Signed-off-by: Casey Bodley <cbodley@redhat.com>
Reported-by: John Wilkins <jowilkin@redhat.com>
2016-04-26 15:24:16 -04:00
Casey Bodley
910d2d0012 Merge pull request #8746 from yehudasa/wip-15598
Fixes: http://tracker.ceph.com/issues/15598

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-04-26 11:49:42 -04:00
Yehuda Sadeh
bc0dda02f9 Merge pull request #8762 from ceph/wip-15595
rgw: fix bad free in RGWCreateBucket_ObjStore_S3

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-04-26 08:37:42 -07:00
Willem Jan Withagen
e5a2a88926 FileStore.cc: Make sure str-pointer has not 0x0 when referenced
ceph-osd crashes on reference to where if it is not get_index or lfn_find.
So init with an "empty" indicator "()

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-04-26 17:09:22 +02:00
Casey Bodley
7251dbeed4 rgw: fix bad free in RGWCreateBucket_ObjStore_S3
get_params() will accept -ERR_LENGTH_REQUIRED from
rgw_rest_read_all_input(), in which case 'data' will not be allocated
and we attempt to free() an uninitialized pointer

Fixes: http://tracker.ceph.com/issues/15595

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-04-26 10:58:24 -04:00
Haomai Wang
bd77cd4139 msg/async: add numevents statistics for external_eventsReviewed-by: Haomai Wang <haomai@xsky.com>
msg/async: add numevents statistics for external_events

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-04-26 22:14:31 +08:00
Mykola Golub
fe5207278d rbd: CLI to retrieve rbd mirror state for a pool / specific image
Fixes: #15144
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-04-26 15:52:09 +03:00