]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorgw: return retcode of failing coroutine
Yehuda Sadeh [Thu, 6 Aug 2015 23:11:34 +0000 (16:11 -0700)]
rgw: return retcode of failing coroutine

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: rename async ops to coroutines
Yehuda Sadeh [Thu, 6 Aug 2015 22:37:46 +0000 (15:37 -0700)]
rgw: rename async ops to coroutines

which they basically are

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: fail if master zone tries to use meta sync
Yehuda Sadeh [Thu, 6 Aug 2015 18:26:31 +0000 (11:26 -0700)]
rgw: fail if master zone tries to use meta sync

We'll change it later, but as it is now that's the way to handle it
gracefully.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: Fix init_complete
Orit Wasserman [Tue, 28 Jul 2015 11:36:44 +0000 (13:36 +0200)]
rgw: Fix init_complete

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: support old region configurations
Orit Wasserman [Mon, 13 Jul 2015 16:32:46 +0000 (18:32 +0200)]
rgw: support old region configurations

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: Remove region admin commands
Orit Wasserman [Tue, 14 Jul 2015 11:53:08 +0000 (13:53 +0200)]
rgw: Remove region admin commands

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: Add zone group admin commands
Orit Wasserman [Mon, 13 Jul 2015 13:07:25 +0000 (15:07 +0200)]
rgw: Add zone group admin commands

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: zonegroup json encoding/decoding with backward compatability
Orit Wasserman [Tue, 14 Jul 2015 08:53:43 +0000 (10:53 +0200)]
rgw: zonegroup json encoding/decoding with backward compatability

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: Rename Region to ZoneGroup only internal structures and class
Orit Wasserman [Mon, 13 Jul 2015 12:56:53 +0000 (14:56 +0200)]
rgw: Rename Region to ZoneGroup only internal structures and class

User visuable are not changed: admin commands, jsons and rados objects names

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Conflicts:
src/rgw/rgw_admin.cc
src/rgw/rgw_rados.cc

9 years agorgw: Add period admin commands and rest api to handle period
Orit Wasserman [Mon, 29 Jun 2015 14:48:34 +0000 (16:48 +0200)]
rgw: Add period admin commands and rest api to handle period

the new commands are prepare,delete, get, activate, pull and push

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Conflicts:
src/rgw/rgw_admin.cc

9 years agorgw: Add RGWPeriod
Orit Wasserman [Thu, 25 Jun 2015 08:45:24 +0000 (10:45 +0200)]
rgw: Add RGWPeriod

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: Add RGWRealm class and admin commands to handle it
Orit Wasserman [Thu, 18 Jun 2015 10:53:00 +0000 (12:53 +0200)]
rgw: Add RGWRealm class and admin commands to handle it

admin realm commands: create, get, delete, rename, set-default and get-default

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: Use switch for raw storage opcodes
Orit Wasserman [Thu, 18 Jun 2015 10:56:37 +0000 (12:56 +0200)]
rgw: Use switch for raw storage opcodes

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: use string for default realm
Orit Wasserman [Fri, 3 Jul 2015 15:03:06 +0000 (17:03 +0200)]
rgw: use string for default realm

Conflicts:
src/rgw/rgw_rados.cc

9 years agorgw: Add RGWSystemMetaObj class
Orit Wasserman [Fri, 19 Jun 2015 13:21:55 +0000 (15:21 +0200)]
rgw: Add RGWSystemMetaObj class

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Conflicts:
src/rgw/rgw_rados.cc

9 years agorgw: Add RGWNameToId and RGWDefaultSystemMetaObjInfo
Orit Wasserman [Fri, 12 Jun 2015 23:29:12 +0000 (01:29 +0200)]
rgw: Add RGWNameToId and RGWDefaultSystemMetaObjInfo

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: fix test_rgw_admin_log.cc
Orit Wasserman [Tue, 28 Jul 2015 16:42:33 +0000 (18:42 +0200)]
rgw: fix test_rgw_admin_log.cc

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agocmake: add rgw_sync.cc
Orit Wasserman [Tue, 28 Jul 2015 15:53:31 +0000 (17:53 +0200)]
cmake: add rgw_sync.cc

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: async ops can generate new stacks for parallel execution
Yehuda Sadeh [Thu, 6 Aug 2015 00:19:11 +0000 (17:19 -0700)]
rgw: async ops can generate new stacks for parallel execution

Can now have an op generating another op that will be called at
a different stack. The current op will halt execution until new
op finishes. We can call this multiple times so that multiple ops
will be executed concurrently. This can be useful in the case we
want to generate a single op that will read from multiple objects,
after it had read some meta information. So the root op will read
the meta information and will generate multiple request that will
execute concurrently (albeit on a single thread).

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: a few bug fixes related to async operations
Yehuda Sadeh [Wed, 5 Aug 2015 23:22:49 +0000 (16:22 -0700)]
rgw: a few bug fixes related to async operations

fix uninitialized state, trim stacks, etc.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: add a generic op to pull data off metadata obj
Yehuda Sadeh [Wed, 5 Aug 2015 21:58:17 +0000 (14:58 -0700)]
rgw: add a generic op to pull data off metadata obj

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: add another state for simple async ops
Yehuda Sadeh [Wed, 5 Aug 2015 21:24:33 +0000 (14:24 -0700)]
rgw: add another state for simple async ops

so that these ops can chain other ops and handle their
response

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: more simplification
Yehuda Sadeh [Wed, 5 Aug 2015 21:07:08 +0000 (14:07 -0700)]
rgw: more simplification

create a helper method in the ops manager to run a single op, it
builds the needed env

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: more simplification, no need to take reference to op
Yehuda Sadeh [Wed, 5 Aug 2015 20:58:55 +0000 (13:58 -0700)]
rgw: more simplification, no need to take reference to op

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: some cleanup, keep async env structure
Yehuda Sadeh [Wed, 5 Aug 2015 20:51:56 +0000 (13:51 -0700)]
rgw: some cleanup, keep async env structure

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: create simple async op handler
Yehuda Sadeh [Wed, 5 Aug 2015 20:20:09 +0000 (13:20 -0700)]
rgw: create simple async op handler

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: async rados requests through a work queue
Yehuda Sadeh [Wed, 5 Aug 2015 00:23:10 +0000 (17:23 -0700)]
rgw: async rados requests through a work queue

Tie in the async rados requests to the async framework.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: retrieve a specific sync shard info
Yehuda Sadeh [Mon, 3 Aug 2015 23:01:22 +0000 (16:01 -0700)]
rgw: retrieve a specific sync shard info

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw-admin: command to show mdlog sync status
Yehuda Sadeh [Sat, 1 Aug 2015 00:09:30 +0000 (17:09 -0700)]
rgw-admin: command to show mdlog sync status

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: stackable ops infrastructure
Yehuda Sadeh [Fri, 31 Jul 2015 22:26:25 +0000 (15:26 -0700)]
rgw: stackable ops infrastructure

ops can now call other ops, so that we could simplify
the different states each ops need to keep.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: initial work on sync status marker
Yehuda Sadeh [Fri, 31 Jul 2015 20:20:50 +0000 (13:20 -0700)]
rgw: initial work on sync status marker

Also, rename radosgw-admin mdlog sync to radosgw-admin mdlog-fetch.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: read mdlog marker
Yehuda Sadeh [Fri, 24 Jul 2015 06:06:28 +0000 (23:06 -0700)]
rgw: read mdlog marker

Use our local marker as a starting point for fetching the mater mdlog.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: clean up mdlog clone states, other fixes
Yehuda Sadeh [Thu, 23 Jul 2015 21:31:21 +0000 (14:31 -0700)]
rgw: clean up mdlog clone states, other fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: don't reference msg after finish_request()
Yehuda Sadeh [Thu, 23 Jul 2015 21:16:37 +0000 (14:16 -0700)]
rgw: don't reference msg after finish_request()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: hide the completion manager
Yehuda Sadeh [Wed, 22 Jul 2015 22:57:26 +0000 (15:57 -0700)]
rgw: hide the completion manager

some more layer separation

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: create some abstraction around async ops infrastructure
Yehuda Sadeh [Wed, 22 Jul 2015 22:37:30 +0000 (15:37 -0700)]
rgw: create some abstraction around async ops infrastructure

This will be reused later for other operations.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: mdlog sync error reporting on failed request
Yehuda Sadeh [Wed, 22 Jul 2015 18:35:15 +0000 (11:35 -0700)]
rgw: mdlog sync error reporting on failed request

Basic error reporting. We'll need to dump this to the backend and
add admin commands to read.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agosome error handling work, not ready yet
Yehuda Sadeh [Tue, 21 Jul 2015 03:17:36 +0000 (20:17 -0700)]
some error handling work, not ready yet

9 years agorgw: md log cloning completely async
Yehuda Sadeh [Fri, 17 Jul 2015 23:29:19 +0000 (16:29 -0700)]
rgw: md log cloning completely async

hook librados completions into the rgw completion notifier, split the
md log write into two different states.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: rework metadata log sync to use async capabilities
Yehuda Sadeh [Thu, 16 Jul 2015 23:44:39 +0000 (16:44 -0700)]
rgw: rework metadata log sync to use async capabilities

We now have a window of operations. The next step will be to
asynchronously write to the local mdlog, so that we don't
just hold the work on a synchronous request.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: can now wait on async rest requests
Yehuda Sadeh [Thu, 16 Jul 2015 23:43:25 +0000 (16:43 -0700)]
rgw: can now wait on async rest requests

In addition to waiting on a specific request, added a
completion manager that we can wait on so that we get
which request is ready.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: add new class to create resource request
Yehuda Sadeh [Sat, 11 Jul 2015 00:10:25 +0000 (17:10 -0700)]
rgw: add new class to create resource request

RGWRESTReadResource holds the request input and output. Previously
we were using stack variables that couldn't be used in the async
path.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: more http aio stuff
Yehuda Sadeh [Thu, 9 Jul 2015 23:27:41 +0000 (16:27 -0700)]
rgw: more http aio stuff

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: threaded http manager groundwork
Yehuda Sadeh [Thu, 9 Jul 2015 21:33:26 +0000 (14:33 -0700)]
rgw: threaded http manager groundwork

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: more work on cleaning up http client interfaces
Yehuda Sadeh [Thu, 9 Jul 2015 20:05:00 +0000 (13:05 -0700)]
rgw: more work on cleaning up http client interfaces

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: rework http client to handle multiple async requests
Yehuda Sadeh [Wed, 8 Jul 2015 23:11:14 +0000 (16:11 -0700)]
rgw: rework http client to handle multiple async requests

Currently we use the curl multi handler using only a single handle. Rework
things a bit to prepare for multiple handlers.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: paginated mdlog clone
Yehuda Sadeh [Tue, 7 Jul 2015 23:21:47 +0000 (16:21 -0700)]
rgw: paginated mdlog clone

still need to iterate by going through over older entries first

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: initial mdlog clone implementation
Yehuda Sadeh [Tue, 7 Jul 2015 20:56:03 +0000 (13:56 -0700)]
rgw: initial mdlog clone implementation

naive handling, not paging, unbalanced.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: can list mdlog entries
Yehuda Sadeh [Fri, 3 Jul 2015 00:00:39 +0000 (17:00 -0700)]
rgw: can list mdlog entries

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: move json helper into RGWRESTConn
Yehuda Sadeh [Thu, 2 Jul 2015 22:54:22 +0000 (15:54 -0700)]
rgw: move json helper into RGWRESTConn

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoceph_json: make sure header doesn't clobber _ASSERT_H
Yehuda Sadeh [Thu, 2 Jul 2015 22:48:16 +0000 (15:48 -0700)]
ceph_json: make sure header doesn't clobber _ASSERT_H

_ASSERT_H is needed for dout() compilation

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: decode number of mdlog shards
Yehuda Sadeh [Thu, 2 Jul 2015 18:43:09 +0000 (11:43 -0700)]
rgw: decode number of mdlog shards

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: fix use of zone name
Yehuda Sadeh [Thu, 2 Jul 2015 17:53:53 +0000 (10:53 -0700)]
rgw: fix use of zone name

zone_name doesn't really hold what we need

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw-admin: initial mdlog sync work
Yehuda Sadeh [Thu, 2 Jul 2015 17:54:48 +0000 (10:54 -0700)]
rgw-admin: initial mdlog sync work

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: initial work on mdlog sync
Yehuda Sadeh [Wed, 1 Jul 2015 23:25:00 +0000 (16:25 -0700)]
rgw: initial work on mdlog sync

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: don't do set_attr on meta objects
Yehuda Sadeh [Thu, 25 Jun 2015 20:01:00 +0000 (13:01 -0700)]
rgw: don't do set_attr on meta objects

only complete object writes (and attributes) is now available. This helps
managing the meta heap and simplifies the states. Since we cannot use rm_attrs
anymore, need to reset meta object before writing it.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: store immutable metadata entries in heap pool
Yehuda Sadeh [Tue, 23 Jun 2015 23:41:31 +0000 (16:41 -0700)]
rgw: store immutable metadata entries in heap pool

Define a new pool for immutable metadata, store new meta objects
in that pool.
(still need to work on the set_attrs case)

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: rename default pool names
Yehuda Sadeh [Fri, 12 Jun 2015 16:10:46 +0000 (09:10 -0700)]
rgw: rename default pool names

Name default pools a bit better

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: don't require system pools to start with a period
Yehuda Sadeh [Fri, 12 Jun 2015 00:03:08 +0000 (17:03 -0700)]
rgw: don't require system pools to start with a period

Make sure cache operations are being done on system objects.
Separate calls where needed to make sure that separate pool/bucket
handling is done correctly. When separating calls, don't use objv_tracker
for data objects, don't use data constructs for system objects.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agocmake: add cls_timeindex to rgw targets
Casey Bodley [Thu, 17 Sep 2015 19:01:08 +0000 (15:01 -0400)]
cmake: add cls_timeindex to rgw targets

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #7496 from xiexingguo/xxg-wip-fixnvme
Sage Weil [Tue, 9 Feb 2016 14:02:22 +0000 (09:02 -0500)]
Merge pull request #7496 from xiexingguo/xxg-wip-fixnvme

osd: BlueStore/NVMEDevice: fix compiling and fd leak

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7349 from yuyuyu101/add-pwritev
Sage Weil [Tue, 9 Feb 2016 13:58:28 +0000 (08:58 -0500)]
Merge pull request #7349 from yuyuyu101/add-pwritev

osd: FileStore: use pwritev instead of lseek+writev

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7504 from renhwsky/renhw-wip-mon-shutdown
Sage Weil [Tue, 9 Feb 2016 13:57:11 +0000 (08:57 -0500)]
Merge pull request #7504 from renhwsky/renhw-wip-mon-shutdown

mon: unregister command on shutdown

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #7550 from tchaikov/wip-osd-cleanup
Sage Weil [Tue, 9 Feb 2016 13:56:48 +0000 (08:56 -0500)]
Merge pull request #7550 from tchaikov/wip-osd-cleanup

osd: a fix for HeartbeatDispatcher and cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7553 from XinzeChi/wip-osdmap-affinity
Sage Weil [Tue, 9 Feb 2016 13:56:14 +0000 (08:56 -0500)]
Merge pull request #7553 from XinzeChi/wip-osdmap-affinity

osd: OSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7560 from tchaikov/wip-fix-icl
Sage Weil [Tue, 9 Feb 2016 13:55:59 +0000 (08:55 -0500)]
Merge pull request #7560 from tchaikov/wip-fix-icl

crush/CrushTester: workaround a bug in boost::icl

9 years agoMerge pull request #7568 from liewegas/wip-bluestore-mutex
Sage Weil [Tue, 9 Feb 2016 13:55:43 +0000 (08:55 -0500)]
Merge pull request #7568 from liewegas/wip-bluestore-mutex

osd: bluestore/blockdevice: use std::mutex et al

9 years agoMerge pull request #7578 from ceph/fix-stripper
Jason Dillaman [Tue, 9 Feb 2016 12:57:53 +0000 (07:57 -0500)]
Merge pull request #7578 from ceph/fix-stripper

Stripper: Fix incorrect push_front -> append_zero change

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoStripper: Fix incorrect push_front -> append_zero change 7578/head
Haomai Wang [Tue, 9 Feb 2016 08:46:44 +0000 (16:46 +0800)]
Stripper: Fix incorrect push_front -> append_zero change

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7444 from dreamhost/wip-rgw-static-website-robbat2
Yehuda Sadeh [Tue, 9 Feb 2016 00:48:14 +0000 (16:48 -0800)]
Merge pull request #7444 from dreamhost/wip-rgw-static-website-robbat2

rgw: approximate AmazonS3 HostId error field.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Mon, 8 Feb 2016 22:26:13 +0000 (17:26 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agov10.0.3 v10.0.3
Sage Weil [Mon, 8 Feb 2016 22:10:53 +0000 (17:10 -0500)]
v10.0.3

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7572 from ceph/wip-cmake-2-8-16
Casey Bodley [Mon, 8 Feb 2016 20:00:57 +0000 (15:00 -0500)]
Merge pull request #7572 from ceph/wip-cmake-2-8-16

cmake: Added new unittests to make check

9 years agoMerge pull request #7574 from SUSE/wip-spec-license
Sage Weil [Mon, 8 Feb 2016 18:43:38 +0000 (13:43 -0500)]
Merge pull request #7574 from SUSE/wip-spec-license

ceph.spec.in: add license declaration

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoceph.spec.in: add license declaration 7574/head
Nathan Cutler [Mon, 8 Feb 2016 17:57:31 +0000 (18:57 +0100)]
ceph.spec.in: add license declaration

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agocmake: Added new unittests to make check 7572/head
Ali Maredia [Mon, 8 Feb 2016 17:30:45 +0000 (12:30 -0500)]
cmake: Added new unittests to make check

Added unittest_shunique_lock & unittest_mutex_debug
to make check, and made them link ALLOC_LIBS

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #7569 from SUSE/wip-copyright2
Sage Weil [Mon, 8 Feb 2016 15:48:07 +0000 (10:48 -0500)]
Merge pull request #7569 from SUSE/wip-copyright2

ceph.spec.in: add copyright notice

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoceph.spec.in: add copyright notice 7569/head
Nathan Cutler [Mon, 8 Feb 2016 14:58:51 +0000 (15:58 +0100)]
ceph.spec.in: add copyright notice

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoos/bluestore/BlockDevice: std::atomic_int 7568/head
Sage Weil [Fri, 5 Feb 2016 16:45:23 +0000 (11:45 -0500)]
os/bluestore/BlockDevice: std::atomic_int

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlockDevice: use std::mutex and std::condition_variable
Sage Weil [Fri, 5 Feb 2016 16:20:15 +0000 (11:20 -0500)]
os/bluestore/BlockDevice: use std::mutex and std::condition_variable

Pull aio wait code into an IOContext method too.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7513 from athanatos/wip-ceph-test-rados-2
Sage Weil [Mon, 8 Feb 2016 14:23:56 +0000 (09:23 -0500)]
Merge pull request #7513 from athanatos/wip-ceph-test-rados-2

ceph_test_rados: use less CPU

9 years agoMerge pull request #5931 from ceph/wip-cxx11concurrency
Sage Weil [Mon, 8 Feb 2016 14:23:15 +0000 (09:23 -0500)]
Merge pull request #5931 from ceph/wip-cxx11concurrency

librados: move to c++11 concurrency types

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge branch 'print-blocked-op' of git://github.com/majianpeng/ceph
Sage Weil [Mon, 8 Feb 2016 14:14:21 +0000 (09:14 -0500)]
Merge branch 'print-blocked-op' of git://github.com/majianpeng/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6608 from esnyder/wip-6634
Sage Weil [Mon, 8 Feb 2016 14:17:49 +0000 (09:17 -0500)]
Merge pull request #6608 from esnyder/wip-6634

osd: remove unused SnapContext member snapc from MOSDSubOp message

Reviewed-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge branch 'master' of git://github.com/joconcepts/ceph
Sage Weil [Mon, 8 Feb 2016 14:12:12 +0000 (09:12 -0500)]
Merge branch 'master' of git://github.com/joconcepts/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7181 from songbaisen/song5
Sage Weil [Mon, 8 Feb 2016 14:16:14 +0000 (09:16 -0500)]
Merge pull request #7181 from songbaisen/song5

crush: reply quickly from get_immediate_parent

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7437 from Ved-vampir/wip_zlib_plugin
Sage Weil [Mon, 8 Feb 2016 14:15:04 +0000 (09:15 -0500)]
Merge pull request #7437 from Ved-vampir/wip_zlib_plugin

common: add zlib compression plugin

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7527 from liewegas/wip-no-rgw-prestart
Sage Weil [Mon, 8 Feb 2016 14:13:38 +0000 (09:13 -0500)]
Merge pull request #7527 from liewegas/wip-no-rgw-prestart

systemd/ceph-radosgw-prestart.sh: remove

Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #7547 from yuyuyu101/wip-14679
Haomai Wang [Mon, 8 Feb 2016 06:15:37 +0000 (14:15 +0800)]
Merge pull request #7547 from yuyuyu101/wip-14679

AsyncConnection: avoid debug log in cleanup_handler

9 years agocrush/CrushTester: workaround a bug in boost::icl 7560/head
Kefu Chai [Mon, 8 Feb 2016 05:37:43 +0000 (13:37 +0800)]
crush/CrushTester: workaround a bug in boost::icl

the boost::icl in boost v1.55 has a bug when working with libc++,

> Assertion failed: (this->_map.find(inter_val) == this->_map.end()),
> function gap_insert, file
> /usr/local/include/boost/icl/interval_base_map.hpp, line 555.

see https://svn.boost.org/trac/boost/ticket/9501 and
    https://svn.boost.org/trac/boost/ticket/9987

the bug was fixed in boost v1.56. as a workaround we use the the
`set` from `boost::container` instead of the `std::set` from libc++.
we should drop this workaround once we bump the supported boost
version from 1.42 to 1.56.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7554 from tchaikov/wip-ceph-disk-test
Kefu Chai [Sun, 7 Feb 2016 17:52:16 +0000 (01:52 +0800)]
Merge pull request #7554 from tchaikov/wip-ceph-disk-test

tests: ceph-disk.sh should compare with the resolved path

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoOSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from 7553/head
Xinze Chi [Sun, 7 Feb 2016 10:50:29 +0000 (18:50 +0800)]
OSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from

Base on current logic, OSDMonitor may call create_pending and
encode_pending twice for the some epoch.

In encode_pending:

tmp.deepish_copy_from(osdmap);
tmp.apply_incremental(pending_inc);

This Op would change the tmp osd_primary_affinity, but the osd_primary_affinity
is declared as ceph::shared_ptr, so this would change the osdmap too. When this
round encode_pending is proposed fail. We may call encode_pending again, but the
osdmap is changed last round, so the pending_inc would be wrong.

Fixes: #14686
Signed-off-by: Xinze Chi <xinze@xsky.com>
9 years agoMerge pull request #7551 from JevonQ/update-libcephfs-version
Sage Weil [Sun, 7 Feb 2016 14:01:04 +0000 (09:01 -0500)]
Merge pull request #7551 from JevonQ/update-libcephfs-version

libcephfs: update LIBCEPHFS_VERSION to indicate the interface was changed

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agotests: ceph-disk.sh should compare with the resolved path 7554/head
Kefu Chai [Sun, 7 Feb 2016 12:36:58 +0000 (04:36 -0800)]
tests: ceph-disk.sh should compare with the resolved path

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agolibcephfs: Update LIBCEPHFS_VERSION to indicate the interface was changed 7551/head
Jevon Qiao [Sun, 7 Feb 2016 06:00:53 +0000 (14:00 +0800)]
libcephfs: Update LIBCEPHFS_VERSION to indicate the interface was changed

Signed-off-by: Jevon Qiao <scaleqiao@gmail.com>
9 years agoAsyncMessenger: remove unused variables 7550/head
Kefu Chai [Sat, 6 Feb 2016 17:54:12 +0000 (01:54 +0800)]
AsyncMessenger: remove unused variables

* remove AsyncMessenger::listen_sd
* remove `ee` in KqueueDriver::del_event()

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocrypto: remove unused Digest::sec_type
Kefu Chai [Sat, 6 Feb 2016 17:49:30 +0000 (01:49 +0800)]
crypto: remove unused Digest::sec_type

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agojournal: remove unused ObjectPlayer::m_fetch_interval
Kefu Chai [Sat, 6 Feb 2016 17:44:12 +0000 (01:44 +0800)]
journal: remove unused ObjectPlayer::m_fetch_interval

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agolibrbd: remove unused C_DiffObject::m_request_num
Kefu Chai [Sat, 6 Feb 2016 17:43:09 +0000 (01:43 +0800)]
librbd: remove unused C_DiffObject::m_request_num

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agolibrbd: replace atomic_t with std::atomic<int>
Kefu Chai [Sat, 6 Feb 2016 16:26:59 +0000 (00:26 +0800)]
librbd: replace atomic_t with std::atomic<int>

it fails to compile with clang, and turns out it should be
`ceph::atomic_t`, but I take this chance to replace it
with std::atomic<> to phase out atomic_t.

Signed-off-by: Kefu Chai <kchai@redhat.com>