]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoradosgw-admin: add explanation for EACCESS on 'realm pull' 8264/head
Casey Bodley [Wed, 23 Mar 2016 15:11:48 +0000 (11:11 -0400)]
radosgw-admin: add explanation for EACCESS on 'realm pull'

References #15200

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: 'period commit' supplies user-readable error messages
Casey Bodley [Mon, 21 Mar 2016 18:51:58 +0000 (14:51 -0400)]
rgw: 'period commit' supplies user-readable error messages

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoradosgw-admin: parse error messages from failed requests
Casey Bodley [Fri, 18 Mar 2016 20:56:24 +0000 (16:56 -0400)]
radosgw-admin: parse error messages from failed requests

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #8273 from wjin/fix
Kefu Chai [Wed, 23 Mar 2016 13:43:11 +0000 (21:43 +0800)]
Merge pull request #8273 from wjin/fix

osd: fix log info

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8260 from liewegas/wip-ec-test
Kefu Chai [Wed, 23 Mar 2016 13:22:44 +0000 (21:22 +0800)]
Merge pull request #8260 from liewegas/wip-ec-test

test/test-erasure-code.sh: disable pg_temp priming

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoosd: fix log info 8273/head
Wei Jin [Wed, 23 Mar 2016 08:12:38 +0000 (16:12 +0800)]
osd: fix log info

Signed-off-by: Wei Jin <wjin.cn@gmail.com>
9 years agoMerge pull request #8267 from athanatos/wip-14309
Sage Weil [Tue, 22 Mar 2016 21:27:43 +0000 (17:27 -0400)]
Merge pull request #8267 from athanatos/wip-14309

osd: bail out of _committed_osd_maps if we are shutting down

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8266 from athanatos/wip-test-exit-value
Samuel Just [Tue, 22 Mar 2016 18:24:53 +0000 (11:24 -0700)]
Merge pull request #8266 from athanatos/wip-test-exit-value

Test exit values on test.sh, fix tier.cc

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agotest/librados/tier.cc: Fix Whiteout tests to force promotion 8266/head
Samuel Just [Thu, 17 Mar 2016 18:56:04 +0000 (11:56 -0700)]
test/librados/tier.cc: Fix Whiteout tests to force promotion

Otherwise, there may not actually be whiteouts created.

Fixes: 15177
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoqa/workunits/rados/test.sh: check subprocess return values
Samuel Just [Thu, 17 Mar 2016 18:51:56 +0000 (11:51 -0700)]
qa/workunits/rados/test.sh: check subprocess return values

Fixes: #15165
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8263 from tchaikov/wip-15031
Sage Weil [Tue, 22 Mar 2016 17:10:12 +0000 (13:10 -0400)]
Merge pull request #8263 from tchaikov/wip-15031

msg/async: avoid log spam on throttle

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agotest/test-erasure-code.sh: disable pg temp priming 8260/head
Sage Weil [Tue, 22 Mar 2016 15:47:03 +0000 (11:47 -0400)]
test/test-erasure-code.sh: disable pg temp priming

If we prime pg_temp, there is a race where this test expects an out OSD
to not be in the acting set but it will be there initially.

Fixes: #15211
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomsg/async: avoid log spam on throttle 8263/head
Kefu Chai [Tue, 22 Mar 2016 15:30:14 +0000 (23:30 +0800)]
msg/async: avoid log spam on throttle

increase the log level from 1 to 10, the log is printed when message
throttler kicks in.

Fixes: #15031
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8252 from xiexingguo/xxg-wip-15164
Kefu Chai [Tue, 22 Mar 2016 14:35:00 +0000 (22:35 +0800)]
Merge pull request #8252 from xiexingguo/xxg-wip-15164

doc: fix wrong type of hyphen

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8239 from jcsp/wip-15223
Sage Weil [Tue, 22 Mar 2016 14:32:28 +0000 (10:32 -0400)]
Merge pull request #8239 from jcsp/wip-15223

mon: fix mixed-version MDSMonitor

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agodoc: fix wrong type of hyphen 8252/head
xie xingguo [Tue, 22 Mar 2016 07:23:51 +0000 (15:23 +0800)]
doc: fix wrong type of hyphen

Which makes picture of http://docs.ceph.com/docs/master/start/quick-start-preflight/
look sick.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7934 from ceph/wip-default-tcmalloc-cache-size
Sage Weil [Mon, 21 Mar 2016 23:11:32 +0000 (19:11 -0400)]
Merge pull request #7934 from ceph/wip-default-tcmalloc-cache-size

etc/sysconfig/ceph: set 128MB tcmalloc cache size

Reviewed-by: Mark Nelson <mnelson@redhat.com>
9 years agoMerge pull request #8244 from linuxbox2/jewel-ldap-fixes
Yehuda Sadeh [Mon, 21 Mar 2016 21:48:12 +0000 (14:48 -0700)]
Merge pull request #8244 from linuxbox2/jewel-ldap-fixes

rgw_ldap fixes

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8225 from SUSE/wip-radosgw-description
Yehuda Sadeh [Mon, 21 Mar 2016 20:41:28 +0000 (13:41 -0700)]
Merge pull request #8225 from SUSE/wip-radosgw-description

packaging: align radosgw package description

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8217 from ceph/wip-rbd-mirror-init
Josh Durgin [Mon, 21 Mar 2016 20:35:31 +0000 (13:35 -0700)]
Merge pull request #8217 from ceph/wip-rbd-mirror-init

rbd-mirror: systemd and upstart init scripts

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8245 from theanalyst/fix/delete-zone-msg
Yehuda Sadeh [Mon, 21 Mar 2016 20:33:36 +0000 (13:33 -0700)]
Merge pull request #8245 from theanalyst/fix/delete-zone-msg

rgw: fix error message for zone delete

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8243 from theanalyst/fix/zone-rm-msg
Yehuda Sadeh [Mon, 21 Mar 2016 20:32:38 +0000 (13:32 -0700)]
Merge pull request #8243 from theanalyst/fix/zone-rm-msg

rgw: typo fix for zone delete message

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: fix error message for zone delete 8245/head
Abhishek Lekshmanan [Mon, 21 Mar 2016 19:48:11 +0000 (20:48 +0100)]
rgw: fix error message for zone delete

Currently if a zone is not a part of a zonegroup, an error message
is printed that zone doesn't exist, and the zone gets deleted anyway.
Since this is exhibited only if the zone isn't a part of a zonegroup
and we allow creation of such zones, clarify that the zone wasn't a
part of zonegroup instead

Fixes: #14951
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agorgw_ldap: move update of s->perm_mask 8244/head
Matt Benjamin [Mon, 21 Mar 2016 18:07:16 +0000 (14:07 -0400)]
rgw_ldap:  move update of s->perm_mask

This should happen on successful auth, not only when a new user
record is stored.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw_ldap: two bug fixes
Matt Benjamin [Mon, 21 Mar 2016 17:07:49 +0000 (13:07 -0400)]
rgw_ldap:  two bug fixes

1. only attempt auth on tokens which pass valid() check
2. ignore false positive search result (and fix result in that case)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #8240 from dillaman/wip-15224
Josh Durgin [Mon, 21 Mar 2016 16:58:08 +0000 (09:58 -0700)]
Merge pull request #8240 from dillaman/wip-15224

cls_rbd: throw error if set_features mask included non-mutable feature

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agorgw: fix zone delete message 8243/head
Abhishek Lekshmanan [Mon, 21 Mar 2016 16:04:55 +0000 (17:04 +0100)]
rgw: fix zone delete message

Though this error message is hard to reach, it is still wrongly printed
as failed to create instead of failed to delete.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #8130 from tchaikov/wip-15113
Kefu Chai [Mon, 21 Mar 2016 15:04:44 +0000 (23:04 +0800)]
Merge pull request #8130 from tchaikov/wip-15113

mon: do not panic at seeing requests without session

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agocls_rbd: throw error if set_features mask included non-mutable feature 8240/head
Jason Dillaman [Mon, 21 Mar 2016 13:32:08 +0000 (09:32 -0400)]
cls_rbd: throw error if set_features mask included non-mutable feature

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agomon: fix mixed-version MDSMonitor 8238/head 8239/head
John Spray [Mon, 21 Mar 2016 12:07:25 +0000 (12:07 +0000)]
mon: fix mixed-version MDSMonitor

Encode old-style until mon quorum features indicate
jewel, forbid creating multiple filesystems, and
when creating a single filesystem use the legacy fscid.

Fixes: #15223
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8016 from ErwanAliasr1/evelu-15042
Sage Weil [Mon, 21 Mar 2016 11:41:55 +0000 (07:41 -0400)]
Merge pull request #8016 from ErwanAliasr1/evelu-15042

rpm,deb: remove conditional BuildRequires for btrfs-progs

Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #8214 from athanatos/wip-feature-bits
Sage Weil [Mon, 21 Mar 2016 11:35:27 +0000 (07:35 -0400)]
Merge pull request #8214 from athanatos/wip-feature-bits

Deprecate or free up a bunch of feature bits

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8162 from rjfd/wip-15142
Jason Dillaman [Sat, 19 Mar 2016 22:12:28 +0000 (18:12 -0400)]
Merge pull request #8162 from rjfd/wip-15142

rbd-mirror: use the mirroring directory to detect candidate images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8204 from rjfd/wip-15143
Jason Dillaman [Sat, 19 Mar 2016 22:00:03 +0000 (18:00 -0400)]
Merge pull request #8204 from rjfd/wip-15143

librbd: enable/disable image mirroring automatically for pool mode

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agopackaging: align radosgw package description 8225/head
Nathan Cutler [Sat, 19 Mar 2016 21:30:26 +0000 (22:30 +0100)]
packaging: align radosgw package description

First, make the Debian package description mention that RGW aims to
implement the Swift API.

Second, replace the RPM package description with the Debian one, both for
consistency and because the Debian one is better.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #8172 from trociny/fix-test-rbd-mirror-position
Jason Dillaman [Sat, 19 Mar 2016 20:33:36 +0000 (16:33 -0400)]
Merge pull request #8172 from trociny/fix-test-rbd-mirror-position

test: rbd-mirror: compare positions using all fields

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8185 from trociny/wip-rbd-mirror-faster-exit
Jason Dillaman [Sat, 19 Mar 2016 20:25:08 +0000 (16:25 -0400)]
Merge pull request #8185 from trociny/wip-rbd-mirror-faster-exit

rbd-mirror: fix long termination due to 30sec wait in main loop

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8221 from jdurgin/wip-test-rbd-mirror
Jason Dillaman [Sat, 19 Mar 2016 20:18:19 +0000 (16:18 -0400)]
Merge pull request #8221 from jdurgin/wip-test-rbd-mirror

qa: add workunit to run ceph_test_rbd_mirror

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: fix long termination due to 30sec wait in Mirror::run loop 8185/head
Mykola Golub [Sat, 19 Mar 2016 13:43:58 +0000 (15:43 +0200)]
rbd-mirror: fix long termination due to 30sec wait in Mirror::run loop

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #8191 from liewegas/wip-15180
Sage Weil [Sat, 19 Mar 2016 13:13:23 +0000 (09:13 -0400)]
Merge pull request #8191 from liewegas/wip-15180

qa/workunits/rest/test.py: don't use newfs

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8101 from jjhuo/bluestore
Sage Weil [Sat, 19 Mar 2016 13:13:02 +0000 (09:13 -0400)]
Merge pull request #8101 from jjhuo/bluestore

os/bluestore: small fixes in bluestore StupidAllocator

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8178 from majianpeng/bluefs-closewriter
Sage Weil [Sat, 19 Mar 2016 13:11:56 +0000 (09:11 -0400)]
Merge pull request #8178 from majianpeng/bluefs-closewriter

os/bluestore/BlueFS: Before reap ioct, it should wait io complete

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8220 from dillaman/wip-15202
Josh Durgin [Sat, 19 Mar 2016 00:46:42 +0000 (17:46 -0700)]
Merge pull request #8220 from dillaman/wip-15202

journal: prevent race injecting new records into overflowed object

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa: add workunit to run ceph_test_rbd_mirror 8221/head
Josh Durgin [Sat, 19 Mar 2016 00:23:52 +0000 (17:23 -0700)]
qa: add workunit to run ceph_test_rbd_mirror

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8219 from jdurgin/wip-test-pool-create-cleanup
Josh Durgin [Fri, 18 Mar 2016 23:32:17 +0000 (16:32 -0700)]
Merge pull request #8219 from jdurgin/wip-test-pool-create-cleanup

test_pool_create.sh: put test files in the test dir so they are cleaned up

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agojournal: prevent race injecting new records into overflowed object 8220/head
Jason Dillaman [Fri, 18 Mar 2016 23:18:30 +0000 (19:18 -0400)]
journal: prevent race injecting new records into overflowed object

The recorded added after the overflow will not have been detached
from the object recorder.

Fixes: #15202
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8149 from trociny/test-rbd-mirror
Josh Durgin [Fri, 18 Mar 2016 23:14:36 +0000 (16:14 -0700)]
Merge pull request #8149 from trociny/test-rbd-mirror

test: rbd-mirror: add "switch to the next tag" test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8182 from trociny/wip-rbd-mirror-args
Josh Durgin [Fri, 18 Mar 2016 22:03:33 +0000 (15:03 -0700)]
Merge pull request #8182 from trociny/wip-rbd-mirror-args

rbd-mirror: make remote context respect env and argv config params

Conflicts:
qa/workunits/rbd/rbd_mirror.sh (asok command format changed)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8159 from trociny/wip-rbd-mirror-asok
Josh Durgin [Fri, 18 Mar 2016 21:58:58 +0000 (14:58 -0700)]
Merge pull request #8159 from trociny/wip-rbd-mirror-asok

rbd-mirror: use pool/image names in asok commands

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agopackaging: added rbd-mirror startup scripts 8217/head
Jason Dillaman [Fri, 18 Mar 2016 19:09:21 +0000 (15:09 -0400)]
packaging: added rbd-mirror startup scripts

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoupstart: new rbd-mirror daemon scripts
Jason Dillaman [Fri, 18 Mar 2016 19:06:21 +0000 (15:06 -0400)]
upstart: new rbd-mirror daemon scripts

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agosystemd: new ceph-rbd-mirror scripts
Jason Dillaman [Fri, 18 Mar 2016 18:54:35 +0000 (14:54 -0400)]
systemd: new ceph-rbd-mirror scripts

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoOSD: bail out of _committed_osd_maps if we are shutting down 8267/head
Samuel Just [Fri, 18 Mar 2016 21:30:23 +0000 (14:30 -0700)]
OSD: bail out of _committed_osd_maps if we are shutting down

Introduced in b839a06c1aba24ecf0780387a605192ff929f158
Fixes: 14309
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agotest_pool_create.sh: put test files in the test dir so they are cleaned up 8219/head
Josh Durgin [Fri, 18 Mar 2016 21:28:50 +0000 (14:28 -0700)]
test_pool_create.sh: put test files in the test dir so they are cleaned up

If they aren't cleaned up, tarball gitbuilders are unhappy.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8216 from ceph/wip-rbd-maint-ops
Josh Durgin [Fri, 18 Mar 2016 21:21:01 +0000 (14:21 -0700)]
Merge pull request #8216 from ceph/wip-rbd-maint-ops

qa/workunits/rbd: new online maintenance op tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8183 from ceph/wip-rgw-fix-mdlog
Yehuda Sadeh [Fri, 18 Mar 2016 20:08:46 +0000 (13:08 -0700)]
Merge pull request #8183 from ceph/wip-rgw-fix-mdlog

Wip rgw fix mdlog

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoqa/workunits/rbd: new online maintenance op tests 8216/head
Jason Dillaman [Fri, 18 Mar 2016 14:15:17 +0000 (10:15 -0400)]
qa/workunits/rbd: new online maintenance op tests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8212 from yehudasa/wip-15181
Sage Weil [Fri, 18 Mar 2016 17:41:28 +0000 (13:41 -0400)]
Merge pull request #8212 from yehudasa/wip-15181

cls/rgw: fix use of timespan

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agocls/rgw: fix use of timespan 8212/head
Yehuda Sadeh [Fri, 18 Mar 2016 16:51:34 +0000 (09:51 -0700)]
cls/rgw: fix use of timespan

Need to use make_timespan() when referring to seconds.

Fixes: #15181
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8209 from liewegas/wip-13992
Sage Weil [Fri, 18 Mar 2016 15:52:27 +0000 (11:52 -0400)]
Merge pull request #8209 from liewegas/wip-13992

ceph_test_rados_misc: shorten mount timeout

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoceph_test_rados_misc: shorten mount timeout 8209/head
Sage Weil [Fri, 18 Mar 2016 14:34:26 +0000 (10:34 -0400)]
ceph_test_rados_misc: shorten mount timeout

This might fix #13992.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/filestore: fix warning
Sage Weil [Fri, 18 Mar 2016 14:16:49 +0000 (10:16 -0400)]
os/filestore: fix warning

os/filestore/FileStore.cc: In member function ‘int FileStore::_zero(const coll_t&, const ghobject_t&, uint64_t, size_t)’:
os/filestore/FileStore.cc:3294:24: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
       if (offset + len > st.st_size) {
                        ^

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7932 from theanalyst/mailmap/10.0.4
Loic Dachary [Fri, 18 Mar 2016 14:14:02 +0000 (15:14 +0100)]
Merge pull request #7932 from theanalyst/mailmap/10.0.4

mailmap for 10.0.4

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoqa/workunits/rest/test.py: don't use newfs 8191/head
Sage Weil [Fri, 18 Mar 2016 01:40:17 +0000 (21:40 -0400)]
qa/workunits/rest/test.py: don't use newfs

It doesn't work anymore.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8121 from liewegas/wip-15136
Sage Weil [Fri, 18 Mar 2016 13:44:05 +0000 (09:44 -0400)]
Merge pull request #8121 from liewegas/wip-15136

mon: remove 'mds setmap'

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agorbd: rbd-mirroring: Added unit tests to test image mirroring behaviour 8204/head
Ricardo Dias [Fri, 18 Mar 2016 10:41:09 +0000 (10:41 +0000)]
rbd: rbd-mirroring: Added unit tests to test image mirroring behaviour

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd: rbd-mirroring: Fixed if clause in mirror_image_get_info
Ricardo Dias [Fri, 18 Mar 2016 10:36:46 +0000 (10:36 +0000)]
rbd: rbd-mirroring: Fixed if clause in mirror_image_get_info

This fix targets the case when journaling is not enabled but
someone calls mirror_image_get_info.

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd: rbd-mirroring: Disable image mirroring when journaling feature is disabled
Ricardo Dias [Thu, 17 Mar 2016 15:54:02 +0000 (15:54 +0000)]
rbd: rbd-mirroring: Disable image mirroring when journaling feature is disabled

Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15143
9 years agorbd: rbd-mirroring: Enable image mirroring when journaling feature is enabled
Ricardo Dias [Thu, 17 Mar 2016 11:40:48 +0000 (11:40 +0000)]
rbd: rbd-mirroring: Enable image mirroring when journaling feature is enabled

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd: rbd-mirroring: Enable image mirroring upon create with journaling feature
Ricardo Dias [Wed, 16 Mar 2016 23:17:11 +0000 (23:17 +0000)]
rbd: rbd-mirroring: Enable image mirroring upon create with journaling feature

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agoMerge pull request #8137 from ceph/wip-15146-ceph-dep
branto1 [Fri, 18 Mar 2016 09:10:35 +0000 (10:10 +0100)]
Merge pull request #8137 from ceph/wip-15146-ceph-dep

rpm: remove sub-package dependencies on "ceph"

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Jun Huang <hjwsm1989@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #7838 from rldleblanc/pg_prime-enable
Sage Weil [Fri, 18 Mar 2016 01:59:33 +0000 (21:59 -0400)]
Merge pull request #7838 from rldleblanc/pg_prime-enable

mon: enable 'mon osd prime pg temp' by default

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7939 from yangdongsheng/remove_v1
Sage Weil [Fri, 18 Mar 2016 01:56:48 +0000 (21:56 -0400)]
Merge pull request #7939 from yangdongsheng/remove_v1

mon: standardize Ceph removal commands

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7721 from xiexingguo/xxg-wip-fixdc
Sage Weil [Fri, 18 Mar 2016 01:55:11 +0000 (21:55 -0400)]
Merge pull request #7721 from xiexingguo/xxg-wip-fixdc

os/filestore: fix result handling logic of destroy_collection

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7754 from xiexingguo/xxg-wip-14845
Sage Weil [Fri, 18 Mar 2016 01:54:32 +0000 (21:54 -0400)]
Merge pull request #7754 from xiexingguo/xxg-wip-14845

osd: fix inaccurate counter and skip over queueing an empty transaction

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7970 from Yan-waller/yj-wip-async
Sage Weil [Fri, 18 Mar 2016 01:53:38 +0000 (21:53 -0400)]
Merge pull request #7970 from Yan-waller/yj-wip-async

msg/async: _try_send trim already sent for outcoming_bl more efficient

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #8127 from ceph/wip-15122
Sage Weil [Fri, 18 Mar 2016 01:52:18 +0000 (21:52 -0400)]
Merge pull request #8127 from ceph/wip-15122

ceph_test_msgr: reduce test size to fix memory size

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge branch 'wip-13990' of git://github.com/tchaikov/ceph
Sage Weil [Fri, 18 Mar 2016 01:46:45 +0000 (21:46 -0400)]
Merge branch 'wip-13990' of git://github.com/tchaikov/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8160 from yuyuyu101/jewel-spdk
Sage Weil [Fri, 18 Mar 2016 01:47:57 +0000 (21:47 -0400)]
Merge pull request #8160 from yuyuyu101/jewel-spdk

os/bluestore/NVMEDevice: make IO thread using dpdk launch

9 years agoMerge pull request #8163 from liewegas/wip-15151
Sage Weil [Fri, 18 Mar 2016 01:47:28 +0000 (21:47 -0400)]
Merge pull request #8163 from liewegas/wip-15151

osd/ReplicatedPG: clear watches on change after applying repops

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7359 from songbaisen/song9
Sage Weil [Thu, 17 Mar 2016 22:00:10 +0000 (18:00 -0400)]
Merge pull request #7359 from songbaisen/song9

mon: consider pool size when creating pool

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7674 from majianpeng/bluestore-sync-transaction
Sage Weil [Thu, 17 Mar 2016 21:59:47 +0000 (17:59 -0400)]
Merge pull request #7674 from majianpeng/bluestore-sync-transaction

os/bluestore: make bluestore_sync_transaction = true can work.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7860 from majianpeng/bluestores-clone-overlay
Sage Weil [Thu, 17 Mar 2016 21:59:26 +0000 (17:59 -0400)]
Merge pull request #7860 from majianpeng/bluestores-clone-overlay

os/bluestore: clone overlay data

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7930 from ceph/wip-debian-librgw-tests
Sage Weil [Thu, 17 Mar 2016 21:58:58 +0000 (17:58 -0400)]
Merge pull request #7930 from ceph/wip-debian-librgw-tests

debian: package librgw_file* tests

9 years agoMerge remote-tracking branch 'gh/wip-strict-debian-deps'
Sage Weil [Thu, 17 Mar 2016 21:53:23 +0000 (17:53 -0400)]
Merge remote-tracking branch 'gh/wip-strict-debian-deps'

9 years agoMerge pull request #7957 from majianpeng/bluestore-read
Sage Weil [Thu, 17 Mar 2016 21:57:01 +0000 (17:57 -0400)]
Merge pull request #7957 from majianpeng/bluestore-read

os/filestore: require offset == length == 0 for full object read; add test

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #8039 from gregsfortytwo/wip-14962-greg
Sage Weil [Thu, 17 Mar 2016 21:56:06 +0000 (17:56 -0400)]
Merge pull request #8039 from gregsfortytwo/wip-14962-greg

osd/ReplicatedPG: be more careful about calling publish_stats_to_osd()

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8096 from liewegas/wip-15073
Sage Weil [Thu, 17 Mar 2016 21:55:31 +0000 (17:55 -0400)]
Merge pull request #8096 from liewegas/wip-15073

osd: ensure new osdmaps commit before publishing them to pgs

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorgw: use current period id when it is empty for mdlog list and shard lock/unlock 8183/head
Orit Wasserman [Tue, 15 Mar 2016 13:33:58 +0000 (14:33 +0100)]
rgw: use current period id when it is empty for mdlog list and shard lock/unlock

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8167 from theanalyst/mstart/rgw_ports
Yehuda Sadeh [Thu, 17 Mar 2016 18:06:37 +0000 (11:06 -0700)]
Merge pull request #8167 from theanalyst/mstart/rgw_ports

mstart: start rgw on different ports as well

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoosd: assert that we don't try to use an OSDMap > superblock.newest_map 8096/head
Sage Weil [Mon, 14 Mar 2016 18:24:17 +0000 (14:24 -0400)]
osd: assert that we don't try to use an OSDMap > superblock.newest_map

handle_osd_map now adds OSDMaps to the cache as it receives them
but before they are stable.  Ensure that we don't try to use them.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: commit osdmaps before exposing them to PGs
Sage Weil [Mon, 14 Mar 2016 17:47:31 +0000 (13:47 -0400)]
osd: commit osdmaps before exposing them to PGs

handle_osd_map and the PGs use different sequencers when writing
their updates.  We therefore need to make sure new osdmaps are
committed to disk before we expose them to PGs, lest they update
their info to reference a new osdmap that hasn't actually
committed yet.

This doesn't happen with FileStore because transactions are
ordered when they are queued, but it does affect BlueStore.

Fix by splitting handle_osd_map into two phases, one that just
persists stuff, and the second half that publishes the new maps to
the rest of the OSD.

Fixes: #15073
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8170 from yehudasa/wip-rgw-sync-fixes-3
Yehuda Sadeh [Thu, 17 Mar 2016 16:21:15 +0000 (09:21 -0700)]
Merge pull request #8170 from yehudasa/wip-rgw-sync-fixes-3

Wip rgw sync fixes 3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoos/bluestore/BlueFS: Before reap ioct, it should wait io complete. 8178/head
Jianpeng Ma [Thu, 17 Mar 2016 16:18:48 +0000 (00:18 +0800)]
os/bluestore/BlueFS: Before reap ioct, it should wait io complete.

When change write mode of FileWrite(in _flush_range) from buffer to
direct. osd met segment fault.
This because call _close_writer don't check related ios whether
complete.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agomon: ignore msg without session attached 8130/head
Kefu Chai [Tue, 15 Mar 2016 12:07:11 +0000 (20:07 +0800)]
mon: ignore msg without session attached

there is chance that a connection gets reset, and the session attached
to a message that was sent over this connection is reset. i.e.
con->set_priv(NULL) in Monitor::ms_handle_reset(), but we are about to
handle_command() this message after the message is somehow requeued. so,
not all MonOpRequests have an attached Session, especially those are
re-dispatched. we could check conn->is_connected() everywhere, but
that's error-prone and hard to maintain. so, in this change:

* we need to check for the session before looking at it closer.
* hold a reference to it when holding it, because in another thread,
  ms_handle_reset() could be freeing it.

Fixes: #15113
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agomon: remove 'mds setmap' command 8121/head
Sage Weil [Tue, 15 Mar 2016 13:44:04 +0000 (09:44 -0400)]
mon: remove 'mds setmap' command

This command has no discernable purpose, and is difficult and
dangerous to support anyway.

Fixes: #15136
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agotest: rbd-mirror: different log and asok location for local/remote contexts 8182/head
Mykola Golub [Thu, 17 Mar 2016 12:46:21 +0000 (14:46 +0200)]
test: rbd-mirror: different log and asok location for local/remote contexts

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agorbd-mirror: make remote context respect env and argv config params
Mykola Golub [Thu, 17 Mar 2016 11:24:53 +0000 (13:24 +0200)]
rbd-mirror: make remote context respect env and argv config params

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #8179 from zhjwpku/zhjwpku
Kefu Chai [Thu, 17 Mar 2016 10:14:41 +0000 (18:14 +0800)]
Merge pull request #8179 from zhjwpku/zhjwpku

doc/architecture.rst: remove redundant word "across"

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc/architecture.rst: remove redundant word "across" 8179/head
Zhao Junwang [Thu, 17 Mar 2016 09:34:51 +0000 (17:34 +0800)]
doc/architecture.rst: remove redundant word "across"

Signed-off-by: Zhao Junwang <zhjwpku@gmail.com>