Loic Dachary
eb583cbbbf
build/ops: in jessie virtualenv is in package virtualenv
...
The python scripts are not yet compatible with python3, yet it is the
default on jessie. Force the creation of the virtualenv to use python2.7
instead. The wheelhouse is already explicitly populated for both python3
and python2.7 by install-deps.sh, regardless of the default interpreter.
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-23 19:56:11 +01:00
Alfredo Deza
3777e1b1d4
Merge pull request #8276 from dachary/wip-virtualenv-jewel
...
python: avoid long paths (part 2)
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2016-03-23 08:50:25 -04:00
Loic Dachary
c540835cf3
python: avoid long paths (part 2)
...
make CEPH_BUILD_VIRTUALENV=/tmp TESTS=ceph-detect-init/run-tox.sh check
sets the CEPH_DETECT_INIT_VIRTUALENV environment variable
CEPH_BUILD_VIRTUALENV=/tmp make TESTS=ceph-detect-init/run-tox.sh check
does not because Makefile-env.am overrides it.
Do not set CEPH_BUILD_VIRTUALENV in Makefile-env.am so the variable from
the environment can be used. Require that CEPH_BUILD_VIRTUALENV has a
trailing slash so that the default is just an empty variable.
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-23 13:31:51 +01:00
Alfredo Deza
d92612f364
Merge pull request #8250 from dachary/wip-virtualenv-jewel
...
python: avoid long paths
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2016-03-22 17:51:38 -04:00
Loic Dachary
93c790d72a
python: avoid long paths
...
As a temporary measure because it overflows when jenkins tries to build
in a deep path. Run make with:
make CEPH_BUILD_VIRTUALENV=/tmp
and it will use these directories instead of the default.
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-22 20:37:23 +01: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
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
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
Mykola Golub
bbac7669ba
rbd-mirror: fix long termination due to 30sec wait in Mirror::run loop
...
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-19 15:43:58 +02:00
Sage Weil
5c5a50745f
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>
2016-03-19 09:13:23 -04:00
Sage Weil
a10b059537
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>
2016-03-19 09:13:02 -04:00
Sage Weil
57cd121e9e
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>
2016-03-19 09:11:56 -04:00
Josh Durgin
802e6bb490
Merge pull request #8220 from dillaman/wip-15202
...
journal: prevent race injecting new records into overflowed object
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-18 17:46:42 -07:00
Josh Durgin
9f6ec704db
qa: add workunit to run ceph_test_rbd_mirror
...
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-03-18 17:23:52 -07:00
Josh Durgin
a27f9bffb3
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>
2016-03-18 16:32:17 -07:00
Jason Dillaman
9722dee145
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>
2016-03-18 19:18:30 -04:00
Josh Durgin
1bb70b643d
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>
2016-03-18 16:14:36 -07:00
Josh Durgin
62771e4a92
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>
2016-03-18 15:03:33 -07:00
Josh Durgin
c6c4f6095a
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>
2016-03-18 14:58:58 -07:00
Jason Dillaman
f5375dcd1f
packaging: added rbd-mirror startup scripts
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 17:53:06 -04:00
Jason Dillaman
58d47347bc
upstart: new rbd-mirror daemon scripts
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 17:53:05 -04:00
Jason Dillaman
8a0e47281f
systemd: new ceph-rbd-mirror scripts
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 17:51:23 -04:00
Josh Durgin
ebbfdc7a03
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>
2016-03-18 14:29:38 -07:00
Josh Durgin
ae13d6ff55
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>
2016-03-18 14:21:01 -07:00
Yehuda Sadeh
b4860ae892
Merge pull request #8183 from ceph/wip-rgw-fix-mdlog
...
Wip rgw fix mdlog
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-18 13:08:46 -07:00
Jason Dillaman
d9017fb95c
qa/workunits/rbd: new online maintenance op tests
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 14:33:20 -04:00
Sage Weil
f0c19a2691
Merge pull request #8212 from yehudasa/wip-15181
...
cls/rgw: fix use of timespan
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-18 13:41:28 -04:00
Yehuda Sadeh
fab2144c95
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>
2016-03-18 09:53:21 -07:00
Sage Weil
88f61daa93
Merge pull request #8209 from liewegas/wip-13992
...
ceph_test_rados_misc: shorten mount timeout
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-18 11:52:27 -04:00
Sage Weil
959ae39ebb
ceph_test_rados_misc: shorten mount timeout
...
This might fix #13992 .
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-18 10:34:53 -04:00