]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoos/bluestore/BlueStore.cc: when do omapclear, it should clear omap_head. 8230/head
Jianpeng Ma [Mon, 21 Mar 2016 12:19:52 +0000 (20:19 +0800)]
os/bluestore/BlueStore.cc: when do omapclear, it should clear omap_head.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoosd/ReplicatedPG: when do omapclear, it clear FLAG_OMAP at the same time.
Jianpeng Ma [Thu, 24 Mar 2016 09:58:31 +0000 (17:58 +0800)]
osd/ReplicatedPG: when do omapclear, it clear FLAG_OMAP  at the same time.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoosd/ReplicatedPG: When do omapclear, it should check object whether is omap.
Jianpeng Ma [Thu, 24 Mar 2016 09:55:00 +0000 (17:55 +0800)]
osd/ReplicatedPG: When do omapclear, it should check object whether is omap.

Though is_omap don't make sure object has omap header or k/v now, if
object isn't has FLAG_OMAP, it must don't have omap header or k/v.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoosd/ReplicatedPG: For omap read ops, it should check object wether has omap
Jianpeng Ma [Thu, 24 Mar 2016 09:49:39 +0000 (17:49 +0800)]
osd/ReplicatedPG: For omap read ops, it should check object wether has omap

For set omap heaader or k/v, it set FLAG_OMAP.  When remove header
or k/v, it don't remove FLAG_OMAP  because it don't  know object whether
have omap header or other k/vs.
Though object has FLAG_OMAP dont mean now it has omap header or k/v, it
better check FLAG_OMAP than pool whether support omap operations for omap reads.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoMerge pull request #8235 from trociny/wip-rbd-mirror-asok
Jason Dillaman [Thu, 24 Mar 2016 00:47:01 +0000 (20:47 -0400)]
Merge pull request #8235 from trociny/wip-rbd-mirror-asok

rbd-mirror: asok commands to get status and flush on Mirror and Replayer level

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8280 from rjfd/wip-15238
Jason Dillaman [Thu, 24 Mar 2016 00:34:17 +0000 (20:34 -0400)]
Merge pull request #8280 from rjfd/wip-15238

rbd-mirror: switch fsid over to mirror uuid

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7902 from jcsp/wip-pycephfs-flock
Gregory Farnum [Thu, 24 Mar 2016 00:06:15 +0000 (17:06 -0700)]
Merge pull request #7902 from jcsp/wip-pycephfs-flock

pybind: add flock to libcephfs python bindings

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #7901 from jcsp/wip-pycephfs-fixes
Gregory Farnum [Thu, 24 Mar 2016 00:05:22 +0000 (17:05 -0700)]
Merge pull request #7901 from jcsp/wip-pycephfs-fixes

libcephfs: fix python tests and fix getcwd on missing dir

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #8271 from vumrao/wip-vumrao-15244
Yehuda Sadeh [Wed, 23 Mar 2016 22:33:47 +0000 (15:33 -0700)]
Merge pull request #8271 from vumrao/wip-vumrao-15244

doc: rgw_region_root_pool option should be in [global]

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8184 from theanalyst/fix/rgw-admin-zone-msg
Yehuda Sadeh [Wed, 23 Mar 2016 22:29:18 +0000 (15:29 -0700)]
Merge pull request #8184 from theanalyst/fix/rgw-admin-zone-msg

rgw: add zone delete to rgw-admin help

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8264 from cbodley/wip-rgw-admin-errors
Yehuda Sadeh [Wed, 23 Mar 2016 22:28:17 +0000 (15:28 -0700)]
Merge pull request #8264 from cbodley/wip-rgw-admin-errors

radosgw-admin: 'period commit' supplies user-readable error messages

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8190 from yehudasa/wip-rgw-sync-fixes-4
Yehuda Sadeh [Wed, 23 Mar 2016 22:23:16 +0000 (15:23 -0700)]
Merge pull request #8190 from yehudasa/wip-rgw-sync-fixes-4

Wip rgw sync fixes 4

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorbd: rbd-mirroring: Replayer registers in remote journal with mirror_uuid 8280/head
Ricardo Dias [Wed, 23 Mar 2016 17:06:46 +0000 (17:06 +0000)]
rbd: rbd-mirroring: Replayer registers in remote journal with mirror_uuid

Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15238
9 years agoMerge pull request #8282 from dillaman/wip-15250
Josh Durgin [Wed, 23 Mar 2016 21:14:30 +0000 (14:14 -0700)]
Merge pull request #8282 from dillaman/wip-15250

rbd: allow librados to prune the command-line for config overrides

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7907 from dachary/wip-subman-facts
Sage Weil [Wed, 23 Mar 2016 21:05:47 +0000 (17:05 -0400)]
Merge pull request #7907 from dachary/wip-subman-facts

script: subscription-manager support

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #8022 from roidayan/fix_compile_against_latest_accelio
Casey Bodley [Wed, 23 Mar 2016 20:32:55 +0000 (16:32 -0400)]
Merge pull request #8022 from roidayan/fix_compile_against_latest_accelio

xio: fix compilation against latest accelio

9 years agorbd: allow librados to prune the command-line for config overrides 8282/head
Jason Dillaman [Wed, 23 Mar 2016 19:34:17 +0000 (15:34 -0400)]
rbd: allow librados to prune the command-line for config overrides

Fixes: #15250
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest/rgw: use bucket for data checkpoint instead of data 8190/head
Yehuda Sadeh [Mon, 21 Mar 2016 23:52:14 +0000 (16:52 -0700)]
test/rgw: use bucket for data checkpoint instead of data

data checkpoint is not accurate, as data log might not show repeating changes.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: data sync, update and flush high marker
Yehuda Sadeh [Mon, 21 Mar 2016 23:50:32 +0000 (16:50 -0700)]
rgw: data sync, update and flush high marker

We need to update the high marker even if we skip entries, and eventually
flush it. This is needed so that our position in the bucket index log that
we follow is reflected correctly.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: update data log even if canceling index operation
Yehuda Sadeh [Mon, 21 Mar 2016 23:49:20 +0000 (16:49 -0700)]
rgw: update data log even if canceling index operation

Need to update the data log anyway, so that it reflects that there were
changes in the bucket index log.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: break out of run_sync() if going down
Yehuda Sadeh [Mon, 21 Mar 2016 23:48:01 +0000 (16:48 -0700)]
rgw: break out of run_sync() if going down

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: fix bucket_instance_meta_info mtime json decoding
Yehuda Sadeh [Fri, 18 Mar 2016 22:49:20 +0000 (15:49 -0700)]
rgw: fix bucket_instance_meta_info mtime json decoding

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8277 from SUSE/wip-15246
Sage Weil [Wed, 23 Mar 2016 16:55:38 +0000 (12:55 -0400)]
Merge pull request #8277 from SUSE/wip-15246

rpm: prefer UID/GID 167 when creating ceph user/group

Reviewed-by: David Disseldorp ddiss@suse.de
Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #8222 from SUSE/wip-14984
Sage Weil [Wed, 23 Mar 2016 16:33:39 +0000 (12:33 -0400)]
Merge pull request #8222 from SUSE/wip-14984

systemd: set up environment in rbdmap unit file

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoxio: fix compilation against latest accelio 8022/head
Roi Dayan [Sun, 14 Feb 2016 09:45:22 +0000 (11:45 +0200)]
xio: fix compilation against latest accelio

Do not use C struct initilization style to avoid eclipse errors.
We also don't use c++ struct initalize as members are not specified
and it just happens that in latest accelio version one of the fields
has changed in the middle of the struct.

Signed-off-by: Roi Dayan <roid@mellanox.com>
9 years agoMerge pull request #8268 from yehudasa/wip-15243
Yehuda Sadeh [Wed, 23 Mar 2016 16:26:00 +0000 (09:26 -0700)]
Merge pull request #8268 from yehudasa/wip-15243

rgw: convert plain object to versioned (with null version) when removing

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8148 from roidayan/xio-add_prefix_to_xio_logs
Casey Bodley [Wed, 23 Mar 2016 16:21:52 +0000 (12:21 -0400)]
Merge pull request #8148 from roidayan/xio-add_prefix_to_xio_logs

xio: add prefix to xio msgr logs

9 years agoMerge pull request #8227 from roidayan/xio-call_xio_init_first
Casey Bodley [Wed, 23 Mar 2016 16:21:09 +0000 (12:21 -0400)]
Merge pull request #8227 from roidayan/xio-call_xio_init_first

xio: xio_init needs to be called before any other xio function

9 years agoMerge pull request #8207 from theanalyst/doc/mstart
Sage Weil [Wed, 23 Mar 2016 16:17:53 +0000 (12:17 -0400)]
Merge pull request #8207 from theanalyst/doc/mstart

doc: very basic doc on mstart

9 years agoMerge pull request #8237 from oritwas/wip-rgw-fix-mrun
Casey Bodley [Wed, 23 Mar 2016 15:35:23 +0000 (11:35 -0400)]
Merge pull request #8237 from oritwas/wip-rgw-fix-mrun

cmake: fix mrun to handle cmake build structure

9 years agorgw: convert plain object to versioned (with null version) when removing 8268/head
Yehuda Sadeh [Wed, 23 Mar 2016 01:14:57 +0000 (18:14 -0700)]
rgw: convert plain object to versioned (with null version) when removing

Fixes #15243

When removing a plain null versioned object (was created prior to bucket versioning
enabled), need to convert the bucket index representation to a versioned one. This
is needed so that all the versioning mechanics play together.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
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 agoRPM: prefer UID/GID 167 when creating ceph user/group 8277/head
Nathan Cutler [Wed, 23 Mar 2016 12:46:25 +0000 (13:46 +0100)]
RPM: prefer UID/GID 167 when creating ceph user/group

This change affects openSUSE/SLE only.

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

Signed-off-by: Nathan Cutler <ncutler@suse.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 agodoc: rgw_region_root_pool option should be in [global] 8271/head
Vikhyat Umrao [Wed, 23 Mar 2016 06:19:43 +0000 (11:49 +0530)]
doc: rgw_region_root_pool option should be in [global]
     add new option rgw_zonegroup_root_pool from Jewel.

Fixes: #15244
Signed-off-by: Vikhyat Umrao <vumrao@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 agocmake: fix mrun to handle cmake build structure 8237/head
Orit Wasserman [Mon, 21 Mar 2016 12:46:52 +0000 (13:46 +0100)]
cmake: fix mrun to handle cmake build structure

Signed-off-by: Orit Wasserman <owasserm@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 agorbd-mirror: asok commands to get status and flush on Mirror and Replayer level 8235/head
Mykola Golub [Sun, 20 Mar 2016 19:05:36 +0000 (21:05 +0200)]
rbd-mirror: asok commands to get status and flush on Mirror and Replayer level

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agorbd-mirror: async flush for ImageReplayer
Mykola Golub [Sun, 20 Mar 2016 08:02:18 +0000 (10:02 +0200)]
rbd-mirror: async flush for ImageReplayer

Signed-off-by: Mykola Golub <mgolub@mirantis.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 agoqa: test_rbdmap_RBDMAPFILE.sh workunit 8222/head
Nathan Cutler [Sun, 20 Mar 2016 17:05:37 +0000 (18:05 +0100)]
qa: test_rbdmap_RBDMAPFILE.sh workunit

Before a7a3658 the rbdmap script was logging bogus messages and not working
on systemd platforms because the unit file was not defining the RBDMAPFILE
environment variable.

This workunit asserts that the bug has been fixed.

http://tracker.ceph.com/issues/14984 References: #14984

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorgw: add zone delete to rgw-admin help 8184/head
Abhishek Lekshmanan [Thu, 17 Mar 2016 14:07:23 +0000 (15:07 +0100)]
rgw: add zone delete to rgw-admin help

This operation is already implemented (OPT_ZONE_DELETE), however not
mentioned in the help, just adding to the help options

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoxio: xio_init needs to be called before any other xio function 8227/head
Roi Dayan [Wed, 9 Mar 2016 11:21:11 +0000 (13:21 +0200)]
xio: xio_init needs to be called before any other xio function

Latest accelio code removes the attribute to call xio_init on load
and XioMessenger will first try to initialize portals and create xio context.
This commit will fix this behavior and call xio_init first.

Signed-off-by: Roi Dayan <roid@mellanox.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 agorbdmap: drop init- prefix from logger tag
Nathan Cutler [Sat, 19 Mar 2016 05:27:13 +0000 (06:27 +0100)]
rbdmap: drop init- prefix from logger tag

Since init-rbdmap is sysvinit-specific, tagging log lines "init-rbdmap" is
potentially misleading.

In systemd- and upstart-based systems, /usr/bin/rbdmap is run directly.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorbdmap: default RBDMAPFILE to reasonable value
Nathan Cutler [Sat, 19 Mar 2016 05:17:54 +0000 (06:17 +0100)]
rbdmap: default RBDMAPFILE to reasonable value

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agosystemd: set up environment in rbdmap unit file
Nathan Cutler [Sat, 19 Mar 2016 04:36:59 +0000 (05:36 +0100)]
systemd: set up environment in rbdmap unit file

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

Signed-off-by: Nathan Cutler <ncutler@suse.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 agorgw_admin: new command to get bilog status
Yehuda Sadeh [Fri, 18 Mar 2016 22:15:47 +0000 (15:15 -0700)]
rgw_admin: new command to get bilog status

Signed-off-by: Yehuda Sadeh <yehuda@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 agorgw: don't record fetch remote obj in new multisite
Yehuda Sadeh [Fri, 18 Mar 2016 20:55:55 +0000 (13:55 -0700)]
rgw: don't record fetch remote obj in new multisite

No need to record the ops status in new multisite. It was used in v1
to record fetching remote objs during the operation, since these could
time out (were triggered by RESTful copy object that could take too long).
With v2 it can't time out, so no need to make it stateful.

Signed-off-by: Yehuda Sadeh <yehuda@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>