Sage Weil
f9b079e0af
Merge pull request #7907 from dachary/wip-subman-facts
...
script: subscription-manager support
Reviewed-by: Boris Ranto <branto@redhat.com>
2016-03-23 17:05:47 -04:00
Casey Bodley
72c5736ac0
Merge pull request #8022 from roidayan/fix_compile_against_latest_accelio
...
xio: fix compilation against latest accelio
2016-03-23 16:32:55 -04:00
Sage Weil
1aa2fe6ca2
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>
2016-03-23 12:55:38 -04:00
Sage Weil
df6570c2bd
Merge pull request #8222 from SUSE/wip-14984
...
systemd: set up environment in rbdmap unit file
Reviewed-by: Boris Ranto <branto@redhat.com>
2016-03-23 12:33:39 -04:00
Roi Dayan
f1743dbb0b
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>
2016-03-23 18:30:53 +02:00
Yehuda Sadeh
baa9883039
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>
2016-03-23 09:26:00 -07:00
Casey Bodley
1bccc8a5ab
Merge pull request #8148 from roidayan/xio-add_prefix_to_xio_logs
...
xio: add prefix to xio msgr logs
2016-03-23 12:21:52 -04:00
Casey Bodley
e1c0217b77
Merge pull request #8227 from roidayan/xio-call_xio_init_first
...
xio: xio_init needs to be called before any other xio function
2016-03-23 12:21:09 -04:00
Sage Weil
a09da43201
Merge pull request #8207 from theanalyst/doc/mstart
...
doc: very basic doc on mstart
2016-03-23 12:17:53 -04:00
Casey Bodley
01f50d4af2
Merge pull request #8237 from oritwas/wip-rgw-fix-mrun
...
cmake: fix mrun to handle cmake build structure
2016-03-23 11:35:23 -04:00
Yehuda Sadeh
c6334d430b
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>
2016-03-23 08:26:58 -07:00
Kefu Chai
71cfaf244e
Merge pull request #8273 from wjin/fix
...
osd: fix log info
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-23 21:43:11 +08:00
Nathan Cutler
c2909465f8
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>
2016-03-23 14:38:14 +01:00
Kefu Chai
41def3a04b
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>
2016-03-23 21:22:44 +08:00
Wei Jin
ac17e66766
osd: fix log info
...
Signed-off-by: Wei Jin <wjin.cn@gmail.com>
2016-03-23 16:13:11 +08:00
Sage Weil
135d5fe1d2
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>
2016-03-22 17:27:43 -04:00
Samuel Just
3156ebf9ed
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>
2016-03-22 11:24:53 -07:00
Samuel Just
c335855e97
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>
2016-03-22 11:23:51 -07:00
Samuel Just
926f8ed77b
qa/workunits/rados/test.sh: check subprocess return values
...
Fixes : #15165
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-22 11:23:48 -07:00
Sage Weil
39eae12ca6
Merge pull request #8263 from tchaikov/wip-15031
...
msg/async: avoid log spam on throttle
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-22 13:10:12 -04:00
Sage Weil
811af31e6c
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>
2016-03-22 11:47:03 -04:00
Kefu Chai
d296609c76
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>
2016-03-22 23:30:17 +08:00
Kefu Chai
aed6a0244c
Merge pull request #8252 from xiexingguo/xxg-wip-15164
...
doc: fix wrong type of hyphen
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-22 22:35:00 +08:00
Sage Weil
294b7b7b14
Merge pull request #8239 from jcsp/wip-15223
...
mon: fix mixed-version MDSMonitor
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-22 10:32:28 -04:00
Orit Wasserman
14dc8473e2
cmake: fix mrun to handle cmake build structure
...
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-03-22 09:34:51 +01:00
xie xingguo
d51f56423e
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>
2016-03-22 15:23:51 +08:00
Sage Weil
6e74170189
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>
2016-03-21 19:11:32 -04:00
Yehuda Sadeh
f245208f31
Merge pull request #8244 from linuxbox2/jewel-ldap-fixes
...
rgw_ldap fixes
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-21 14:48:12 -07:00
Yehuda Sadeh
5df0653723
Merge pull request #8225 from SUSE/wip-radosgw-description
...
packaging: align radosgw package description
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-21 13:41:28 -07:00
Josh Durgin
227b943d38
Merge pull request #8217 from ceph/wip-rbd-mirror-init
...
rbd-mirror: systemd and upstart init scripts
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-21 13:35:31 -07:00
Yehuda Sadeh
304d8b8554
Merge pull request #8245 from theanalyst/fix/delete-zone-msg
...
rgw: fix error message for zone delete
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-21 13:33:36 -07:00
Yehuda Sadeh
ae2d527352
Merge pull request #8243 from theanalyst/fix/zone-rm-msg
...
rgw: typo fix for zone delete message
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-21 13:32:38 -07:00
Abhishek Lekshmanan
c9245e7118
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>
2016-03-21 20:57:34 +01:00
Matt Benjamin
88d35e9d5f
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>
2016-03-21 14:19:15 -04:00
Matt Benjamin
6ffa9c7559
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>
2016-03-21 14:02:33 -04:00
Josh Durgin
46935ab819
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>
2016-03-21 09:58:08 -07:00
Abhishek Lekshmanan
acea6efb5e
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>
2016-03-21 17:04:55 +01:00
Kefu Chai
35479a92e5
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>
2016-03-21 23:04:44 +08:00
Jason Dillaman
127c26f02c
cls_rbd: throw error if set_features mask included non-mutable feature
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-21 09:32:08 -04:00
John Spray
ba1dd35392
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>
2016-03-21 12:55:38 +00:00
Sage Weil
19aabf4a30
Merge pull request #8016 from ErwanAliasr1/evelu-15042
...
rpm,deb: remove conditional BuildRequires for btrfs-progs
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-03-21 07:41:55 -04:00
Sage Weil
81f53dfb67
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>
2016-03-21 07:35:27 -04:00
Nathan Cutler
0effb9e385
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>
2016-03-20 22:50:47 +01:00
Roi Dayan
3a9a60bd41
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>
2016-03-20 09:28:29 +02:00
Jason Dillaman
22cac93ec7
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>
2016-03-19 18:12:28 -04:00
Jason Dillaman
bdab6d0293
Merge pull request #8204 from rjfd/wip-15143
...
librbd: enable/disable image mirroring automatically for pool mode
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-19 18:00:03 -04:00
Nathan Cutler
c4364b13b7
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>
2016-03-19 22:43:53 +01:00
Jason Dillaman
f65cc6fc31
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>
2016-03-19 16:33:36 -04:00
Jason Dillaman
4a83b208d1
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>
2016-03-19 16:25:08 -04:00
Jason Dillaman
f938586451
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>
2016-03-19 16:18:19 -04:00